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

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

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

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.5 → 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.5 → 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.5 → 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.5 → 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.5 → whatap_python-1.7.6}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.5
+Version: 1.7.6
 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'