whatap-python 1.8.1__tar.gz → 1.8.3__tar.gz

{whatap_python-1.8.1 → whatap_python-1.8.3}/PKG-INFO

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

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/__init__.py

@@ -8,7 +8,6 @@ from whatap import build
 from whatap.util.date_util import DateUtil
 import threading
 import builtins
-import configparser
 
 __version__ = build.version
 
@@ -49,19 +48,33 @@ LOG_FILE_NAME = 'whatap-hook.log'
 
 isFrappeCommands = "get-frappe-commands" in sys.argv if hasattr(sys, "argv") else False
 
-temporary_config = configparser.ConfigParser()
+def read_ignore_whatap_stdout():
+    ignore_whatap_stdout = 'false'
+    home = os.environ.get('WHATAP_HOME', '.')
+    whatap_config = os.path.join(home, 'whatap.conf')
+    try:
+        with open(whatap_config) as f:
+            for raw in f:
+                line = raw.strip()
+                if not line or line.startswith('#'):
+                    continue
+                if line.startswith('ignore_whatap_stdout'):
+                    parts = line.split('=', 1)
+                    if len(parts) == 2:
+                        ignore_whatap_stdout = parts[1].strip()
+                    break
+        return ignore_whatap_stdout
 
-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')
+    except FileNotFoundError:
+        return ignore_whatap_stdout
+
+    except Exception as e:
+        print(f'WHATAP: config parse error ({e!r})')
+        return ignore_whatap_stdout
+
+
+
+ignore_whatap_stdout = read_ignore_whatap_stdout()
 
 
 
@@ -70,7 +83,7 @@ original_print = builtins.print
 def print_option(func):
     def wrapper(*args, **kwargs):
 
-        if(console_option == 'false'):
+        if(ignore_whatap_stdout == 'false'):
             result = func(*args, **kwargs)
         else:
             result = None

whatap_python-1.8.3/whatap/build.py

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

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/trace/mod/application_fastapi.py

@@ -310,8 +310,8 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
     callback = None
 
     try:
-        callback = await fn(*args, **kwargs)
         from fastapi.responses import StreamingResponse
+        callback = await fn(*args, **kwargs)
         ctx = TraceContextManager.getLocalContext()
 
         if isinstance(callback, StreamingResponse) and hasattr(callback, "body_iterator"):

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/trace/mod/application_flask.py

@@ -26,21 +26,25 @@ def instrument(module):
     def wrapper(fn):
         @trace_handler(fn)
         def trace(*args, **kwargs):
+            from werkzeug.exceptions import HTTPException
             callback = fn(*args, **kwargs)
-            if not callback:
+            if callback is None:
                 e = args[1]
                 errors = [e.__class__.__name__]
-                if hasattr(args[1], 'code'):
-                    status_code = e.code
+                status_code = getattr(e, 'code', 500)
+                #Flask 레이어의 예외 처리
+                if isinstance(e, HTTPException):
                     errors.append(e.description)
+
+                #Flask 예외 객체가 아닌 경우의 예외처리
+                #에러 코드와 메세지가 함께 나타날 수 있음.
                 else:
                     status_code = 500
-                    errors.append(e.args[0])
-                
+                    errors.append(str(e))
                 interceptor_error(status_code, errors)
-            
+
             return callback
-        
+
         return trace
     if hasattr(module.Flask, '_find_error_handler'):
         module.Flask._find_error_handler = wrapper(

whatap_python-1.8.3/whatap/trace/mod/application_odoo.py

@@ -0,0 +1,59 @@
+import traceback
+from whatap.trace.mod.application_wsgi import interceptor, trace_handler, interceptor_error
+from whatap.trace.trace_context_manager import TraceContextManager
+
+
+def instrument(module):
+    root = module.http.root
+    AppClass = root.__class__
+    original_call = AppClass.__call__
+
+    def wrapper(fn):
+        @trace_handler(fn, True)
+        def trace(self, environ, start_response):
+            def custom_start_response(status, headers, exc_info=None):
+                ctx = TraceContextManager.getLocalContext()
+                try:
+                    ctx.status = int(status.split()[0])
+                except:
+                    ctx.status = 0
+                return start_response(status, headers, exc_info)
+            try:
+                callback = interceptor(fn, self, environ, custom_start_response)
+            except Exception as e:
+                interceptor_error(
+                    500 , #해당 status 값은 에러 처리용으로만 사용됩니다.
+                    [e.__class__.__name__, str(e)]
+                )
+                raise
+            return callback
+
+        return trace
+
+    AppClass.__call__ = wrapper(original_call)
+
+
+    """ 
+    Odoo 16+ HttpDispatcher.handle_error 패치
+    """
+    Dispatcher = getattr(module.http, 'HttpDispatcher', None)
+
+    if Dispatcher:
+        original_handle_error = Dispatcher.handle_error
+
+        def wrapper(fn):
+            @trace_handler(fn)
+            def trace(self,exception):
+                ctx = TraceContextManager.getLocalContext()
+                interceptor_error(
+                    500,  # 해당 status 값은 에러 처리용으로만 사용됩니다.
+                    [exception.__class__.__name__,
+                     str(exception)],
+                    ctx=ctx
+                )
+
+                callback = fn(self, exception)
+                return callback
+
+            return trace
+        Dispatcher.handle_error = wrapper(Dispatcher.handle_error)

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/trace/mod/application_wsgi.py

@@ -404,7 +404,7 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
             x.split('=') for x in re.sub(r'\s*=\s*', '=', args[0]).split())
 
     text = '{}://'.format(db_info.get('type'))
-    text += kwargs.get('user')
+    text += kwargs.get('user' , '')
     text += "@"
     text += kwargs.get('host', kwargs.get('dsn', ''))
     text += '/'
@@ -421,7 +421,7 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
     return callback
 
 
-def addQuoteList(arg_dict):
+def addQuoteDict(arg_dict):
     quoted_dict = dict()
 
     for k, v in arg_dict.items():
@@ -452,7 +452,7 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
     query = None
     if len(args) > 2 and type(args[2]) == dict and args[2]:
         try:
-            query = args[1] % addQuoteList(args[2])
+            query = args[1] % addQuoteDict(args[2])
         except Exception as e:
             pass
     if len(args) > 2 and type(args[2]) in (list, tuple) and args[2]:
@@ -473,7 +473,7 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx.start_time = start_time
 
     text = '{}://'.format(db_info.get('type'))
-    text += db_info.get('user')
+    text += db_info.get('user' , '')
     text += "@"
     text += db_info.get('host', db_info.get('dsn', ''))
     text += '/'
@@ -500,7 +500,8 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
         ctx.elapsed = DateUtil.nowSystem() - start_time
         async_sender.send_packet(PacketTypeEnum.TX_SQL, ctx, datas)
         count = self.rowcount
-        if count > -1:
+
+        if (count is not None) and (count > -1):
             desc = '{0}: {1}'.format('Fetch count', count)
             datas = [' ', ' ', desc]
             ctx.elapsed = 0

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/trace/mod/database_toolkit.py

@@ -78,7 +78,14 @@ def instrument_sqlalchemy_engine(module):
             except Exception as e:
                 query = str(args[2])
             # print('instrument_sqlalchemy_engine 3:', query)
-            if not query :
+            sqlalchemy_track_skip = False
+            except_track_module = ['pymysql', 'mysqldb', 'psycopg2']
+
+            # 이미 DB드라이브 추적 모듈이 존재하면 sqlAlhechmy 의 추적 중지
+            if any(keyword in str(args[0]) for keyword in except_track_module):
+                sqlalchemy_track_skip = True
+
+            if (not query) or (sqlalchemy_track_skip):
                 return fn(*args, **kwargs)
 
             start_time = DateUtil.nowSystem()

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap/trace/trace_module_definition.py

@@ -114,6 +114,9 @@ DEFINITION = {
     'application_frappe': [
         ('frappe.app', 'instrument'),
     ],
+    'application_odoo': [
+        ('odoo', 'instrument'),
+    ],
     'database_cxoracle':[
         ('cx_Oracle', 'instrument_oracle_client'),
     ],

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap_python.egg-info/PKG-INFO

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

{whatap_python-1.8.1 → whatap_python-1.8.3}/whatap_python.egg-info/SOURCES.txt

@@ -59,6 +59,7 @@ whatap/trace/mod/application_flask.py
 whatap/trace/mod/application_frappe.py
 whatap/trace/mod/application_graphql.py
 whatap/trace/mod/application_nameko.py
+whatap/trace/mod/application_odoo.py
 whatap/trace/mod/application_starlette.py
 whatap/trace/mod/application_tornado.py
 whatap/trace/mod/application_wsgi.py

whatap_python-1.8.1/whatap/build.py

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