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

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

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

whatap_python-1.7.9/whatap/build.py

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

{whatap_python-1.7.7 → whatap_python-1.7.9}/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.7 → whatap_python-1.7.9}/whatap/trace/mod/application_django.py

@@ -45,8 +45,17 @@ def instrument(module):
         @trace_handler(fn, True)
         @blocking_handler()
         def trace(*args, **kwargs):
-            callback = interceptor(fn, *args, **kwargs)
+            django_instance = args[0]
+            environ = args[1]
+            original_start_response = args[2]
+
+            def custom_start_response(status, response_headers, exc_info=None):
+                ctx = TraceContextManager.getLocalContext()
+                ctx.status = status[:3]
+                return original_start_response(status, response_headers, exc_info)
 
+            new_args = (django_instance, environ, custom_start_response)
+            callback = interceptor(fn, *new_args, **kwargs)
             return callback
         
         return trace

{whatap_python-1.7.7 → whatap_python-1.7.9}/whatap/trace/mod/application_flask.py

@@ -1,12 +1,22 @@
 from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
     interceptor_error
-
+from whatap.trace.trace_context_manager import TraceContextManager
 
 def instrument(module):
     def wrapper(fn):
         @trace_handler(fn, True)
         def trace(*args, **kwargs):
-            callback = interceptor(fn, *args, **kwargs)
+            flask_instance = args[0]
+            environ = args[1]
+            original_start_response = args[2]
+
+            def custom_start_response(status, response_headers, exc_info=None):
+                ctx = TraceContextManager.getLocalContext()
+                ctx.status = status[:3]
+                return original_start_response(status, response_headers, exc_info)
+
+            new_args = (flask_instance, environ, custom_start_response)
+            callback = interceptor(fn, *new_args, **kwargs)
             return callback
         
         return trace

whatap_python-1.7.9/whatap/trace/mod/application_tornado.py

@@ -0,0 +1,161 @@
+import inspect
+import whatap.net.async_sender as async_sender
+from whatap.net.packet_type_enum import PacketTypeEnum
+from whatap.util.userid_util import UseridUtil as userid_util
+from whatap.trace.trace_context import TraceContext
+from whatap.trace.trace_context_manager import TraceContextManager
+from whatap.util.date_util import DateUtil
+from whatap.conf.configure import Configure as conf
+from whatap.trace.mod.application_wsgi import trace_handler, \
+    start_interceptor, end_interceptor, interceptor_error, isIgnore
+
+
+def parseServiceName(environ):
+    return environ.get('PATH_INFO', '')
+
+
+def instrument(module):
+    def wrapper(fn):
+        async def trace(*args, **kwargs):
+            request = args[0].request
+            environ = {
+                'HTTP_HOST': request.host,
+                'PATH_INFO': request.path,
+                'QUERY_STRING': request.query_arguments,
+                'REMOTE_ADDR': request.remote_ip,
+                'HTTP_USER_AGENT': request.headers.get('User-Agent', ''),
+                'HTTP_REFERER': request.headers.get('Referer', ''),
+                'REQUEST_METHOD': request.method
+            }
+
+            for header_name, value in request.headers.items():
+                key = 'HTTP_' + header_name.upper().replace('-', '_')
+                environ[key] = value
+
+            async def run():
+                await interceptor((fn, environ), *args, **kwargs)
+
+            from tornado.ioloop import IOLoop
+            IOLoop.current().add_callback(run)
+
+            return None
+
+        return trace
+
+    module.RequestHandler._execute = wrapper(module.RequestHandler._execute)
+
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            callback = fn(*args, **kwargs)
+
+            e = args[1]
+            status_code = args[0]._status_code
+            errors = [e.__class__.__name__, str(e)]
+            interceptor_error(status_code, errors)
+            return callback
+
+        return trace
+
+    module.RequestHandler._handle_request_exception = wrapper(
+        module.RequestHandler._handle_request_exception)
+
+
+async def interceptor(rn_environ, *args, **kwargs):
+    if not isinstance(rn_environ, tuple):
+        rn_environ = (rn_environ, args[1])
+    fn, environ = rn_environ
+
+    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', '')
+    ctx.referer = environ.get('HTTP_REFERER', '')
+
+    if conf.trace_user_enabled:
+        if conf.trace_user_using_ip:
+            ctx.userid = userid_util.getRemoteAddr(args)
+        else:
+            ctx.userid, ctx._rawuserid = userid_util.getUserId(args, ctx.remoteIp)
+
+    mstt = environ.get('HTTP_{}'.format(
+        conf._trace_mtrace_caller_key.upper().replace('-', '_')), '')
+
+    if mstt:
+        ctx.setTransfer(mstt)
+        if conf.stat_mtrace_enabled:
+            val = environ.get('HTTP_{}'.format(
+                conf._trace_mtrace_info_key.upper().replace('-', '_')), '')
+            if val and len(val):
+                ctx.setTransferInfo(val)
+            pass
+
+        myid = environ.get('HTTP_{}'.format(
+            conf._trace_mtrace_callee_key.upper().replace('-', '_')), '')
+        if myid:
+            ctx.setTxid(myid)
+    caller_poid = environ.get('HTTP_{}'.format(
+        conf._trace_mtrace_caller_poid_key.upper().replace('-', '_')), '')
+
+    if caller_poid:
+        ctx.mcaller_poid = caller_poid
+
+    try:
+        if isIgnore(ctx.service_name):
+            ctx.is_ignored = True
+            TraceContextManager.end(ctx.id)
+            callback = fn(*args, **kwargs)
+            if inspect.isawaitable(callback):
+                return await callback
+            return callback
+    except Exception:
+        pass
+
+    start_interceptor(ctx)
+
+    try:
+        callback = fn(*args, **kwargs)
+        if inspect.isawaitable(callback):
+            callback = await callback
+
+        query_string = environ.get('QUERY_STRING', '')
+        if query_string:
+            ctx.service_name += '?{}'.format(query_string)
+
+        if ctx.service_name.find('.') > -1 and ctx.service_name.split('.')[
+            1] in conf.web_static_content_extensions:
+            ctx.isStaticContents = 'true'
+
+        handler = args[0]
+        status_code = getattr(handler, '_status_code', 200)
+        if status_code >= 400:
+            errors = [
+                callback.__class__.__name__ if callback else 'Unknown',
+                getattr(callback, 'reason_phrase', '')
+            ]
+            interceptor_error(status_code, errors, ctx=ctx)
+
+        else:
+            ctx.status = status_code
+
+        if conf.profile_http_header_enabled:
+            keys = []
+            for key, value in environ.items():
+                if key.startswith('HTTP_'):
+                    keys.append(key)
+            keys.sort()
+
+            text = ''
+            for key in keys:
+                text += '{}={}\n'.format(key.split('HTTP_')[1].lower(),
+                                         environ[key])
+
+            datas = ['HTTP-HEADERS', 'HTTP-HEADERS', text]
+            ctx.start_time = DateUtil.nowSystem()
+            async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
+
+        return callback
+    finally:
+        end_interceptor(ctx=ctx)

{whatap_python-1.7.7 → whatap_python-1.7.9}/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 = ''

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

@@ -11,8 +11,8 @@ def instrument_oracle_client(module):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             global db_info
-            db_info = {'type': 'oracle'} | kwargs
-
+            db_info = {'type': 'oracle'}
+            db_info.update(kwargs)
             callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
 

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

@@ -9,7 +9,8 @@ def instrument_MySQLdb(module):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             global db_info
-            db_info = {'type': 'mysql'} | kwargs
+            db_info = {'type': 'mysql'}
+            db_info.update(kwargs)
             callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
 
@@ -49,7 +50,8 @@ def instrument_pymysql(module):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             global db_info
-            db_info = {'type': 'mysql'} | kwargs
+            db_info = {'type': 'mysql'}
+            db_info.update(kwargs)
             callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
 

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

@@ -9,7 +9,8 @@ def instrument_psycopg2(module):
         @trace_handler(fn)
         def trace(*args, **kwargs):
             global db_info
-            db_info = {'type': 'postgresql'} | kwargs
+            db_info = {'type': 'postgresql'}
+            db_info.update(kwargs)
             callback = interceptor_db_con(fn, db_info, *args, **kwargs)
             return callback
 

{whatap_python-1.7.7 → whatap_python-1.7.9}/whatap/trace/trace_import.py

@@ -10,6 +10,7 @@ from whatap.trace.trace_module_definition import IMPORT_HOOKS, PLUGIN
 from whatap import logging
 from whatap.conf.configure import Configure as conf
 
+
 def load_module(module, fullname):
     # if conf.dev:
     #     logging.debug(fullname)
@@ -36,23 +37,26 @@ def load_module(module, fullname):
     finally:
         return module
 
+
 class _ImportHookLoader(object):
     def load_module(self, fullname):
         module = sys.modules[fullname]
         return load_module(module, fullname)
 
+
 class _ImportHookChainedLoader(object):
     def __init__(self, loader):
         self.loader = loader
-    
+
     def load_module(self, fullname):
         module = self.loader.load_module(fullname)
         return load_module(module, fullname)
 
+
 class ImportFinder(object):
     def __init__(self):
         self._hooks = {}
-    
+
     def find_module(self, fullname, path=None):
         if fullname not in IMPORT_HOOKS \
                 or fullname.startswith('whatap') \
@@ -66,10 +70,10 @@ class ImportFinder(object):
         if fullname in self._hooks:
             return None
         self._hooks[fullname] = True
-        
+
         # if conf.dev:
         #     logging.debug(fullname)
-        
+
         try:
             if find_spec:
                 spec = find_spec(fullname, path)
@@ -78,7 +82,7 @@ class ImportFinder(object):
             else:
                 __import__(fullname)
                 return _ImportHookLoader()
-        
+
         except Exception as e:
             if conf.dev:
                 print(e)

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

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

whatap_python-1.7.7/whatap/build.py

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

whatap_python-1.7.7/whatap/trace/mod/application_tornado.py

@@ -1,41 +0,0 @@
-from whatap.trace.mod.application_wsgi import trace_handler, \
-    interceptor, interceptor_error
-
-
-def instrument(module):
-    def wrapper(fn):
-        @trace_handler(fn, True)
-        def trace(*args, **kwargs):
-            request = args[0].request
-            
-            environ = dict()
-            environ['HTTP_HOST'] = request.host
-            environ['PATH_INFO'] = request.path
-            environ['QUERY_STRING'] = request.query_arguments
-            environ['REMOTE_ADDR'] = request.remote_ip
-            environ['HTTP_USER_AGENT'] = request.headers.get('User-Agent', '')
-            environ['HTTP_REFERER'] = ''
-            
-            callback = interceptor((fn, environ), *args, **kwargs)
-            
-            return callback
-        
-        return trace
-    
-    module.RequestHandler._execute = wrapper(module.RequestHandler._execute)
-    
-    def wrapper(fn):
-        @trace_handler(fn)
-        def trace(*args, **kwargs):
-            callback = fn(*args, **kwargs)
-            
-            e = args[1]
-            status_code = args[0]._status_code
-            errors = [e.__class__.__name__, str(e)]
-            interceptor_error(status_code, errors)
-            return callback
-        
-        return trace
-    
-    module.RequestHandler._handle_request_exception = wrapper(
-        module.RequestHandler._handle_request_exception)