whatap-python 1.7.6__tar.gz → 1.7.8__tar.gz

{whatap_python-1.7.6 → whatap_python-1.7.8}/PKG-INFO

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

{whatap_python-1.7.6 → whatap_python-1.7.8}/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.8/whatap/build.py

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

{whatap_python-1.7.6 → whatap_python-1.7.8}/whatap/conf/configuration.py

@@ -1,5 +1,6 @@
 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,

{whatap_python-1.7.6 → whatap_python-1.7.8}/whatap/net/packet_enum.py

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

{whatap_python-1.7.6 → whatap_python-1.7.8}/whatap/trace/mod/application_wsgi.py

@@ -96,7 +96,8 @@ def start_interceptor(ctx):
              ctx.userAgentString,
              ctx.referer,
              ctx.userid,
-             ctx.isStaticContents
+             ctx.isStaticContents,
+             ctx.http_method
              ]
     # print("start_interceptor txid:", ctx.id)
     async_sender.send_packet(PacketTypeEnum.TX_START, ctx, datas)
@@ -121,7 +122,7 @@ def end_interceptor(thread_id=None, ctx=None):
     ctx.start_time = start_time
 
     datas = [ctx.host, ctx.service_name, ctx.mtid, ctx.mdepth, ctx.mcaller_txid,
-             ctx.mcaller_pcode, ctx.mcaller_spec, str(ctx.mcaller_url_hash), ctx.mcaller_poid]
+             ctx.mcaller_pcode, ctx.mcaller_spec, str(ctx.mcaller_url_hash), ctx.mcaller_poid,ctx.status]
     ctx.elapsed = DateUtil.nowSystem() - start_time
 
     async_sender.send_packet(PacketTypeEnum.TX_END, ctx, datas)
@@ -149,7 +150,7 @@ def interceptor(rn_environ, *args, **kwargs):
     ctx = TraceContext()
     ctx.host = environ.get('HTTP_HOST', '').split(':')[0]
     ctx.service_name = parseServiceName(environ)
-
+    ctx.http_method = environ.get('REQUEST_METHOD', '')
     ctx.remoteIp = userid_util.getRemoteAddr(args)
 
     ctx.userAgentString = environ.get('HTTP_USER_AGENT', '')
@@ -206,8 +207,10 @@ def interceptor(rn_environ, *args, **kwargs):
 
         if getattr(callback, 'status_code', None):
             status_code = callback.status_code
-            errors = [callback.__class__.__name__, callback.reason_phrase]
-            interceptor_error(status_code, errors, ctx=ctx)
+
+            if (status_code >= 400):
+                errors = [callback.__class__.__name__, callback.reason_phrase]
+                interceptor_error(status_code, errors, ctx=ctx)
 
         if conf.profile_http_header_enabled:
             keys = []
@@ -234,8 +237,8 @@ def interceptor_error(status_code, errors, ctx=None):
         ctx = TraceContextManager.getLocalContext()
     if not ctx:
         return
-    ctx.status = int(status_code / 100)
-    if ctx.status >= 4 and not ctx.error:
+    ctx.status = status_code
+    if status_code >= 400 and not ctx.error:
         ctx.error = 1
 
         error = ''
@@ -382,7 +385,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 +402,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 +445,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 +469,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.6 → whatap_python-1.7.8}/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'}
+            db_info.update(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.6 → whatap_python-1.7.8}/whatap/trace/mod/database_mysql.py

@@ -2,27 +2,31 @@ 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'}
+            db_info.update(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 +36,37 @@ 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'}
+            db_info.update(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 +74,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.6 → whatap_python-1.7.8}/whatap/trace/mod/database_postgresql.py

@@ -2,17 +2,20 @@ 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'}
+            db_info.update(kwargs)
+            callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
-        
+
         return trace
-    
+
     module.connect = wrapper(module.connect)
 
 
@@ -22,9 +25,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 +35,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.6 → whatap_python-1.7.8}/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.6 → whatap_python-1.7.8}/whatap/trace/trace_context.py

@@ -5,6 +5,7 @@ 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
@@ -166,6 +167,8 @@ class TraceContext(object):
     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))))
+                (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.6 → whatap_python-1.7.8}/whatap_python.egg-info/PKG-INFO

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

whatap_python-1.7.6/whatap/build.py

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