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

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

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

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

@@ -7,6 +7,8 @@ import time
 from whatap import build
 from whatap.util.date_util import DateUtil
 import threading
+import builtins
+import configparser
 
 __version__ = build.version
 
@@ -47,6 +49,38 @@ LOG_FILE_NAME = 'whatap-hook.log'
 
 isFrappeCommands = "get-frappe-commands" in sys.argv if hasattr(sys, "argv") else False
 
+temporary_config = configparser.ConfigParser()
+
+try:
+    if os.path.exists('whatap.conf'):
+        with open('whatap.conf') as f:
+            file_content = f.read()
+        temporary_file_content = '[dummy_section]\n' + file_content
+        temporary_config.read_string(temporary_file_content)
+        console_option = temporary_config.get('dummy_section', 'ignore_whatap_stdout', fallback='false')
+    else:
+        console_option = 'false'
+except Exception as e:
+    print('WHATAP : WHATAP.CONF READ ERROR')
+
+
+
+original_print = builtins.print
+
+def print_option(func):
+    def wrapper(*args, **kwargs):
+
+        if(console_option == 'false'):
+            result = func(*args, **kwargs)
+        else:
+            result = None
+        return result
+    return wrapper
+
+__builtins__ = dict(__builtins__)
+__builtins__['print'] = print_option(original_print)
+
+
 def whatap_print(*args):
     if isFrappeCommands:
         logging.info(*args)

whatap_python-1.7.7/whatap/build.py

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

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/conf/configuration.py

@@ -1,12 +1,15 @@
 Configuration = {
     "dev": False,
+    "ignore_whatap_stdout" : False,
     "net_udp_port": "6600",
     "web_static_content_extensions": "js, htm, html, gif, png, jpg, css, swf, ico",
     "trace_auto_normalize_enabled": True,
     "trace_user_enabled": True,
     "trace_user_using_ip": True,
     "trace_logging_enabled": False,
+    "trace_logging_mtid_enabled": False,
     "trace_loguru_enabled": False,
+    "trace_loguru_mtid_enabled": False,
     "trace_ignore_url_set": [],
     "trace_ignore_url_prefix": None,
 

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/application_celery.py

@@ -19,6 +19,7 @@ def interceptor(fn, task_name, *args, **kwargs):
         return callback
     except Exception as e:
         interceptor_step_error(e)
+        raise e
     finally:
         if ctx:
             end_interceptor(ctx=ctx)
@@ -27,14 +28,28 @@ def trace_handler(fn, start=False):
     def handler(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
+
             ctx = TraceContextManager.getLocalContext()
+
             if not start and not ctx:
                 return fn(*args, **kwargs)
-            if ctx and ctx.error_step:
-                end_interceptor(ctx=ctx)
-                raise Exception(ctx.error_step)
-            callback = func(*args, **kwargs)
-            return callback
+
+            try:
+                callback = func(*args, **kwargs)
+            except Exception as e:
+                ctx = TraceContextManager.getLocalContext()
+                if ctx and ctx.error_step == e:
+                    ctx.error_step = None
+                    raise e
+                raise
+            else:
+                ctx = TraceContextManager.getLocalContext()
+                if ctx and ctx.error_step:
+                    e = ctx.error_step
+                    ctx.error_step = None
+                    raise e
+                return callback
+
         return wrapper
 
     return handler

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/application_wsgi.py

@@ -382,7 +382,7 @@ def interceptor_sock_connect(fn, *args, **kwargs):
         ctx.socket_connecting = False
 
 
-def interceptor_db_con(fn, db_type, *args, **kwargs):
+def interceptor_db_con(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
     if not ctx:
         return fn(*args, **kwargs)
@@ -399,7 +399,8 @@ def interceptor_db_con(fn, db_type, *args, **kwargs):
     if not kwargs:
         kwargs = dict(
             x.split('=') for x in re.sub(r'\s*=\s*', '=', args[0]).split())
-    text = '{}://'.format(db_type)
+
+    text = '{}://'.format(db_info.get('type'))
     text += kwargs.get('user')
     text += "@"
     text += kwargs.get('host', kwargs.get('dsn', ''))
@@ -441,7 +442,7 @@ def addQuoteList(arg_list):
     return tuple(quoted_list)
 
 
-def interceptor_db_execute(fn, *args, **kwargs):
+def interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
     # sendDebugProfile(ctx, 'interceptor_db_execute step -1')
     self = args[0]
@@ -465,6 +466,24 @@ def interceptor_db_execute(fn, *args, **kwargs):
     if not query:
         return fn(*args, **kwargs)
 
+    start_time = DateUtil.nowSystem()
+    ctx.start_time = start_time
+
+    text = '{}://'.format(db_info.get('type'))
+    text += db_info.get('user')
+    text += "@"
+    text += db_info.get('host', db_info.get('dsn', ''))
+    text += '/'
+    text += db_info.get('database', db_info.get('db', db_info.get('dbname', '')))
+    ctx.active_dbc = text
+    ctx.lctx['dbc'] = text
+
+    ctx.active_dbc = 0
+
+    datas = [text]
+    ctx.elapsed = DateUtil.nowSystem() - start_time
+    async_sender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, datas)
+
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
     ctx.active_sqlhash = query

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/database_cxoracle.py

@@ -2,27 +2,47 @@ from whatap.trace import get_dict
 from whatap.trace.mod.application_wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
+db_info = {}
+
+
 def instrument_oracle_client(module):
+
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            db_type = 'oracle'
-            callback = interceptor_db_con(fn, db_type, *args, **kwargs)
+            global db_info
+            db_info = {'type': 'oracle'} | kwargs
+
+            callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
+
     if hasattr(module, "connect"):
         module.connect = wrapper(module.connect)
-    
+
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             callback = interceptor_db_close(fn, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     if hasattr(module, "Connection") and hasattr(module.Connection, "close"):
         get_dict(module.Connection)['close'] = wrapper(
             module.Connection.close)
 
+    # def wrapper(fn):
+    #     @trace_handler(fn)
+    #     def trace(*args, **kwargs):
+    #         callback = interceptor_db_execute(fn, db_info, *args, **kwargs)
+    #         return callback
+    #
+    #     return trace
+    #
+    # if hasattr(module, 'Cursor') and hasattr(module.Cursor, "execute"):
+    #     get_dict(module.Cursor)['execute'] = wrapper(module.Cursor.execute)
+
+
+

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/database_mysql.py

@@ -2,27 +2,30 @@ from whatap.trace import get_dict
 from whatap.trace.mod.application_wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
+db_info = {}
 
 def instrument_MySQLdb(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            db_type = 'mysql'
-            callback = interceptor_db_con(fn, db_type, *args, **kwargs)
+            global db_info
+            db_info = {'type': 'mysql'} | kwargs
+            callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
+
     if hasattr(module, "connect"):
         module.connect = wrapper(module.connect)
-    
+
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             callback = interceptor_db_close(fn, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     if hasattr(module, "connection") and hasattr(module.connection, "close"):
         get_dict(module.connection)['close'] = wrapper(
             module.connection.close)
@@ -32,35 +35,36 @@ def instrument_MySQLdb_cursors(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            callback = interceptor_db_execute(fn, *args, **kwargs)
+            callback = interceptor_db_execute(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     module.BaseCursor.execute = wrapper(module.BaseCursor.execute)
-    if hasattr(module.BaseCursor,'callproc'):
-        module.BaseCursor.callproc= wrapper(module.BaseCursor.callproc)
+    if hasattr(module.BaseCursor, 'callproc'):
+        module.BaseCursor.callproc = wrapper(module.BaseCursor.callproc)
 
 def instrument_pymysql(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            db_type = 'mysql'
-            callback = interceptor_db_con(fn, db_type, *args, **kwargs)
+            global db_info
+            db_info = {'type': 'mysql'} | kwargs
+            callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     module.connect = wrapper(module.connect)
-    
+
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             callback = interceptor_db_close(fn, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     module.connections.Connection.close = wrapper(
         module.connections.Connection.close)
 
@@ -68,7 +72,7 @@ def instrument_pymysql_cursors(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            callback = interceptor_db_execute(fn, *args, **kwargs)
+            callback = interceptor_db_execute(fn, db_info, *args, **kwargs)
             return callback
 
         return trace

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/database_postgresql.py

@@ -2,17 +2,19 @@ from whatap.trace import get_dict
 from whatap.trace.mod.application_wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
+db_info = {}
 
 def instrument_psycopg2(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            db_type = 'postgresql'
-            callback = interceptor_db_con(fn, db_type, *args, **kwargs)
+            global db_info
+            db_info = {'type': 'postgresql'} | kwargs
+            callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     module.connect = wrapper(module.connect)
 
 
@@ -22,9 +24,9 @@ def instrument_psycopg2_connection(module):
         def trace(*args, **kwargs):
             callback = interceptor_db_close(fn, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     get_dict(module.connection)['close'] = wrapper(module.connection.close)
 
 
@@ -32,9 +34,9 @@ def instrument_psycopg2_extensions(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
-            callback = interceptor_db_execute(fn, *args, **kwargs)
+            callback = interceptor_db_execute(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     get_dict(module.cursor)['execute'] = wrapper(module.cursor.execute)

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/database_toolkit.py

@@ -47,16 +47,26 @@ def instrument_sqlalchemy_engine(module):
             ctx = TraceContextManager.getLocalContext()
             cursor = args[1]
             query = None
-            if len(args) > 3 and type(args[3]) == dict and args[3]:
+            if len(args) > 3 and args[3]:
                 try:
                     ##oracledb 에서 orm 툴로 sqlalchemy 사용하는 경우
-                    if ":" in args[2] and "oracle" in str(args[0]):
+                    if (type(args[3]) == dict) and (":" in args[2]) and ("oracle" in str(args[0])):
                         oracle_sql_query = args[2]
                         for k, v in args[3].items():
                             replaced_key = f":{k}"
                             replaced_value = f"'{v}'"
-                            oracle_sql_query = oracle_sql_query.replace(replaced_key, replaced_value) if replaced_key in oracle_sql_query else None
+                            oracle_sql_query = oracle_sql_query.replace(replaced_key,
+                                                                        replaced_value) if replaced_key in oracle_sql_query else None
                         query = oracle_sql_query
+
+                    ##aiomysql 에서 orm 툴로 sqlalchemy 사용하는 경우
+                    elif (type(args[3]) == tuple) and ("%s" in args[2]) and ("aiomysql" in str(args[0])):
+                        my_sql_query = args[2]
+                        for v in args[3]:
+                            replaced_value = f"'{v}'"
+                            my_sql_query = my_sql_query.replace("%s", replaced_value,
+                                                                1) if "%s" in my_sql_query else None
+                        query = my_sql_query
                     else:
                         query = args[2] % addQuote(args[3])
                 except Exception as e:

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/mod/logging.py

@@ -20,11 +20,25 @@ def instrument_loguru(module):
             if not ctx:
                 return fn(*args, **kwargs)
 
+            record = args[1]
+
+            if conf.trace_logging_mtid_enabled and ctx and hasattr(ctx, 'mtid') and ctx.mtid:
+                original_message = record["message"]
+                try:
+                    record["message"] = original_message + f" (@mtid: {ctx.mtid})"
+
+                    result = fn(*args, **kwargs)
+                    record["message"] = original_message
+
+                    return result
+                except Exception as e:
+                    record["message"] = original_message
+
             category = "AppLog"
             tags = {'@txid': str(ctx.id)} if ctx is not None else {}
 
             filename = None
-            record = args[1]
+            # record = args[1]
             levelname = record["level"].name
             msg = record["message"]
             fields = {"filename": filename}
@@ -63,11 +77,32 @@ def instrument_logging(module):
             ctx = TraceContextManager.getLocalContext()
             record = args[1]
 
+            if conf.trace_logging_mtid_enabled and ctx and hasattr(ctx, 'mtid') and ctx.mtid:
+                original_msg = record.msg
+                original_args = record.args
+                try:
+                    if isinstance(record.msg, str):
+                        if record.args:
+                            # 포맷 문자열이 있는 경우, 원본 포맷팅을 먼저 수행
+                            formatted_msg = record.msg % record.args
+                            record.msg = formatted_msg
+                            record.args = ()  # args를 비워줌
+                        record.msg = record.msg + f" (@mtid: {ctx.mtid})"
+
+                    result = fn(*args, **kwargs)
+
+                    record.msg = original_msg
+                    record.args = original_args
+
+                    return result
+                except Exception as e:
+                    record.msg = original_msg
+                    record.args = original_args
+
             ##1.3.6 Backward Compatibility
             setattr(record, "txid", None)
 
             if not ctx:
-
                 return fn(*args, **kwargs)
 
             instance = args[0]

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap/trace/trace_context.py

@@ -5,11 +5,13 @@ from whatap.conf.configure import Configure as conf
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.util.date_util import DateUtil
 from whatap.util.hexa32 import Hexa32
+from whatap.util.hash_util import HashUtil
 
 from whatap.util.linked_map import LinkedMap
 from resource import getrusage, RUSAGE_SELF
 import os
 
+
 class TraceContext(object):
     transfer_id = None
     transfer_info = None
@@ -24,7 +26,7 @@ class TraceContext(object):
         self.thread = threading.current_thread()
         self.thread_id = self.thread.ident
         TraceContextManager.start(self)
-        
+
         self.pid = os.getpid()
 
         self.start_time = 0
@@ -32,7 +34,7 @@ class TraceContext(object):
         self.start_malloc = 0
 
         self.status = 0
-        self.asgi_response= None
+        self.asgi_response = None
         self.service_hash = 0
         self.service_name = ''
         self.remoteIp = ''
@@ -97,7 +99,7 @@ class TraceContext(object):
         self.db_opening = False
         self.socket_connecting = False
 
-        self.mcaller_url_hash= 0
+        self.mcaller_url_hash = 0
 
         self.lctx = {}
         self.is_ignored = False
@@ -135,7 +137,7 @@ class TraceContext(object):
         sb = []
         sb.append(str(conf.mtrace_spec))
         sb.append(str(self.service_hash))
-        
+
         transfer_info = ','.join(sb)
         return transfer_info
 
@@ -157,13 +159,16 @@ class TraceContext(object):
         x = headerString.index(',')
         s1 = headerString[0: x]
         self.mcaller_spec = s1
-        self.mcaller_url_hash = headerString[x + 1: ]
+        self.mcaller_url_hash = headerString[x + 1:]
 
     def setTxid(self, myid):
         self.id = Hexa32.toLong32(myid)
 
     def transferPOID(self):
         if not self.transfer_poid:
-            self.transfer_poid = ",".join((Hexa32.toString32(conf.PCODE), Hexa32.toString32(conf.OKIND), Hexa32.toString32(int(conf.OID))))    
+            self.transfer_poid = ",".join(
+                (Hexa32.toString32(conf.PCODE),
+                 Hexa32.toString32(HashUtil.hashFromString(conf.OKIND) if isinstance(conf.OKIND, str) else conf.OKIND),
+                 Hexa32.toString32(int(conf.OID))))
 
         return self.transfer_poid

{whatap_python-1.7.5 → whatap_python-1.7.7}/whatap_python.egg-info/PKG-INFO

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

whatap_python-1.7.5/whatap/build.py

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