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

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

@@ -1,16 +1,18 @@
 Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.8
+Version: 1.8.0
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap
 Author-email: admin@whatap.io
 License: Whatap License
+Requires-Python: >=3.7
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: requires-python
 Dynamic: summary
 
 
@@ -23,7 +25,7 @@ WhaTap_ for python
 
 - Whatap allows for application performance monitoring.
 - Support: WSGI server application & Batch job & Specific method profiling.
-- Python version : 2.7 + & 3.3+
+- Python version : 3.7+
 
 Installation
 ------------

{whatap_python-1.7.8 → whatap_python-1.8.0}/setup.py

@@ -33,5 +33,6 @@ setup(name=build.name,
           ],
       },
       zip_safe=False,
+      python_requires='>=3.7',
       )
 

{whatap_python-1.7.8 → whatap_python-1.8.0}/whatap/README.rst

@@ -8,7 +8,7 @@ WhaTap_ for python
 
 - Whatap allows for application performance monitoring.
 - Support: WSGI server application & Batch job & Specific method profiling.
-- Python version : 2.7 + & 3.3+
+- Python version : 3.7+
 
 Installation
 ------------

whatap_python-1.8.0/whatap/build.py

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

{whatap_python-1.7.8 → whatap_python-1.8.0}/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.8 → whatap_python-1.8.0}/whatap/trace/mod/application_fastapi.py

@@ -28,6 +28,23 @@ _RESPONSE='response'
 _REMOTE_ADDR='remoteAddr'
 _COOKIE='cookie'
 
+async def sse_body_wrapper(original_iterator, ctx,environ, response):
+    try:
+        async for chunk in original_iterator:
+            yield chunk
+    except Exception as e:
+        interceptor_step_error(e)
+        raise
+    finally:
+        if ctx:
+            if conf.profile_http_header_enabled:
+                sendHeaders(ctx, environ)
+            if response and conf.trace_user_enabled:
+                if not conf.trace_user_using_ip:
+                    setUserId(environ, response, ctx._rawuserid)
+            end_interceptor(ctx=ctx)
+
+
 def getUserId(headers,  defValue):
     try:
         if conf.user_header_ticket:
@@ -36,7 +53,7 @@ def getUserId(headers,  defValue):
                 return hash_util.hashFromString(ticket), ticket
             return 0,""
         cookie = headers.get("cookie")
-        
+
         if cookie:
             if len(cookie) >= conf.trace_user_cookie_limit :
                 return defValue
@@ -74,12 +91,12 @@ def sendHeaders(ctx, environ):
     for key, value in environ.items():
         keys.append(key)
     keys.sort()
-    
+
     text = ''
     for key in keys:
         text += '{}={}\n'.format(key,
                                 environ[key])
-    
+
     datas = ['HTTP-HEADERS', 'HTTP-HEADERS', text]
     ctx.start_time = DateUtil.nowSystem()
     async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
@@ -88,7 +105,7 @@ def setUserId(environ, res, cookieValue):
     try:
         if not conf.user_header_ticket:
             cookie = environ.get(_COOKIE)
-            
+
             if not cookie or cookie.find(userid_util.WHATAP_R) < 0 or cookie.find(cookieValue) < 0:
                 res.set_cookie(key=userid_util.WHATAP_R, value=cookieValue, \
                     max_age=bit_util.INT_MAX_VALUE, path="/", \
@@ -118,7 +135,7 @@ def interceptor_error_log(trxid, e, fn, args, kwargs):
         lastlineno = lineno
         lastf_globals = fr.f_globals
 
-    fields = {'errorClass': errorClass, 
+    fields = {'errorClass': errorClass,
                   'args': str(inspect.getcallargs(fn, *args, **kwargs))}
     if lastfilename and lastlineno:
         fields['filename'] = lastfilename
@@ -133,7 +150,7 @@ def interceptor_error_log(trxid, e, fn, args, kwargs):
                 error += ''.join([indicator, l.lstrip()])
             else:
                 error += l
-    
+
     p = logSinkPack.getLogSinkPack(
         t = DateUtil.now(),
         category = "UnhandledException",
@@ -146,7 +163,7 @@ def interceptor_error_log(trxid, e, fn, args, kwargs):
     bout = whatapio.DataOutputX()
     bout.writePack(p, None)
     packbytes = bout.toByteArray()
-    
+
     async_sender.send_relaypack(packbytes)
 
 def interceptor(fn, dependant, *args, **kwargs):
@@ -158,7 +175,7 @@ def interceptor(fn, dependant, *args, **kwargs):
     environ = whatap_dict.get('headers')
     ctx.host = environ.get('host')
     ctx.service_name = dependant.path
-    
+
     ctx.remoteIp = getRemoteAddr(environ, whatap_dict)
 
     ctx.userAgentString = environ.get('user_agent')
@@ -172,7 +189,7 @@ def interceptor(fn, dependant, *args, **kwargs):
 
     mstt = environ.get('{}'.format(
         conf._trace_mtrace_caller_key), '')
-    
+
     if mstt:
         ctx.setTransfer(mstt)
         if conf.stat_mtrace_enabled:
@@ -188,7 +205,7 @@ def interceptor(fn, dependant, *args, **kwargs):
             ctx.setTxid(myid)
     caller_poid = environ.get('{}'.format(
         conf._trace_mtrace_caller_poid_key), '')
-    
+
     if caller_poid:
         ctx.mcaller_poid = caller_poid
 
@@ -200,7 +217,7 @@ def interceptor(fn, dependant, *args, **kwargs):
         pass
 
     start_interceptor(ctx)
-    
+
     try:
         callback = fn(*args, **kwargs)
         ctx = TraceContextManager.getLocalContext()
@@ -219,7 +236,7 @@ def interceptor(fn, dependant, *args, **kwargs):
                 if hasattr(callback, 'reason_phrase'):
                     errors.insert(0, callback.reason_phrase)
                 interceptor_error(status_code, errors)
-                
+
             return callback
     except Exception as e:
         interceptor_step_error(e)
@@ -230,7 +247,7 @@ def interceptor(fn, dependant, *args, **kwargs):
             if conf.profile_http_header_enabled:
                 sendHeaders(ctx, environ)
             response = whatap_dict.get(_RESPONSE)
-            
+
             if response and conf.trace_user_enabled:
                 if not conf.trace_user_using_ip:
                     setUserId(environ, response, ctx._rawuserid )
@@ -241,11 +258,11 @@ def interceptor(fn, dependant, *args, **kwargs):
 async def interceptor_async(fn, dependant, *args, **kwargs):
     if not hasattr(dependant, _WHATAP_DICT):
         return await fn(*args, **kwargs)
-    
+
     ctx = TraceContextManager.getLocalContext()
-    
+
     ctx.service_name = dependant.path
-    
+
     whatap_dict = getattr(dependant, _WHATAP_DICT)
     environ = whatap_dict.get('headers')
     ctx.host = environ.get('host')
@@ -262,7 +279,7 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
 
     mstt = environ.get('{}'.format(
         conf._trace_mtrace_caller_key), '')
-    
+
     if mstt:
         ctx.setTransfer(mstt)
         if conf.stat_mtrace_enabled:
@@ -278,7 +295,7 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
             ctx.setTxid(myid)
     caller_poid = environ.get('{}'.format(
         conf._trace_mtrace_caller_poid_key), '')
-    
+
     if caller_poid:
         ctx.mcaller_poid = caller_poid
 
@@ -288,12 +305,19 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
             return await fn(*args, **kwargs)
     except Exception as e:
         pass
-    
+
     start_interceptor(ctx)
-    
+    callback = None
+
     try:
         callback = await fn(*args, **kwargs)
+        from fastapi.responses import StreamingResponse
         ctx = TraceContextManager.getLocalContext()
+
+        if isinstance(callback, StreamingResponse) and hasattr(callback, "body_iterator"):
+            original_iter = callback.body_iterator
+            callback.body_iterator = sse_body_wrapper(original_iter, ctx, environ,whatap_dict.get(_RESPONSE))
+
         if ctx:
             query_string = "&".join([str(query) for query in dependant.query_params])
             if query_string:
@@ -309,7 +333,7 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
                 if hasattr(callback, 'reason_phrase'):
                     errors.insert(0, callback.reason_phrase)
                 interceptor_error(status_code, errors)
-            
+
             return callback
     except Exception as e:
         interceptor_step_error(e)
@@ -317,7 +341,7 @@ async def interceptor_async(fn, dependant, *args, **kwargs):
         raise e
     finally:
         ctx = TraceContextManager.getLocalContext()
-        if ctx:
+        if ctx and not isinstance(callback, StreamingResponse):
             if conf.profile_http_header_enabled:
                 sendHeaders(ctx, environ)
             response = whatap_dict.get(_RESPONSE)

{whatap_python-1.7.8 → whatap_python-1.8.0}/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.8.0/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.8 → whatap_python-1.8.0}/whatap/trace/trace_import.py

@@ -2,6 +2,7 @@ import sys
 
 try:
     from importlib.util import find_spec
+    from importlib.abc import MetaPathFinder
 except ImportError:
     find_spec = None
 
@@ -10,6 +11,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,24 +38,27 @@ 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):
+
+class ImportFinder(MetaPathFinder):
     def __init__(self):
         self._hooks = {}
-    
-    def find_module(self, fullname, path=None):
+
+    def find_spec(self, fullname, path=None, target=None):
         if fullname not in IMPORT_HOOKS \
                 or fullname.startswith('whatap') \
                 or fullname.startswith('pip'):
@@ -66,19 +71,20 @@ 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)
                 if spec and spec.loader:
-                    return _ImportHookChainedLoader(spec.loader)
+                    spec.loader = _ImportHookChainedLoader(spec.loader)
+                    return spec
             else:
                 __import__(fullname)
                 return _ImportHookLoader()
-        
+
         except Exception as e:
             if conf.dev:
                 print(e)

{whatap_python-1.7.8 → whatap_python-1.8.0}/whatap_python.egg-info/PKG-INFO

@@ -1,16 +1,18 @@
 Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.8
+Version: 1.8.0
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap
 Author-email: admin@whatap.io
 License: Whatap License
+Requires-Python: >=3.7
 Dynamic: author
 Dynamic: author-email
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: requires-python
 Dynamic: summary
 
 
@@ -23,7 +25,7 @@ WhaTap_ for python
 
 - Whatap allows for application performance monitoring.
 - Support: WSGI server application & Batch job & Specific method profiling.
-- Python version : 2.7 + & 3.3+
+- Python version : 3.7+
 
 Installation
 ------------

whatap_python-1.7.8/whatap/build.py

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

whatap_python-1.7.8/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)