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

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

@@ -1,11 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.4
+Version: 1.7.6
 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.4 → whatap_python-1.7.6}/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.6/whatap/build.py

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

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

@@ -6,7 +6,9 @@ Configuration = {
     "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.4 → whatap_python-1.7.6}/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.4 → whatap_python-1.7.6}/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.4 → whatap_python-1.7.6}/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.4 → whatap_python-1.7.6}/whatap/trace/trace_context.py

@@ -10,6 +10,7 @@ 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 +25,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 +33,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 +98,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 +136,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 +158,14 @@ 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(conf.OKIND), Hexa32.toString32(int(conf.OID))))
 
         return self.transfer_poid

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

@@ -1,11 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.4
+Version: 1.7.6
 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.4/whatap/build.py

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