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

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

@@ -1,16 +1,18 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: whatap-python
-Version: 1.7.9
+Version: 1.8.1
 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.9 → whatap_python-1.8.1}/setup.py

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

{whatap_python-1.7.9 → whatap_python-1.8.1}/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.1/whatap/build.py

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

{whatap_python-1.7.9 → whatap_python-1.8.1}/whatap/conf/configuration.py

@@ -12,6 +12,7 @@ Configuration = {
     "trace_loguru_mtid_enabled": False,
     "trace_ignore_url_set": [],
     "trace_ignore_url_prefix": None,
+    "trace_websocket_enabled": False,
 
     "debug": False,
     "query_string_enabled": False,

{whatap_python-1.7.9 → whatap_python-1.8.1}/whatap/net/packet_type_enum.py

@@ -18,6 +18,7 @@ class PacketTypeEnum(object):
     # secure msg
     TX_SECURE_MSG = 13
 
+    TX_WEB_SOCKET = 16
     TX_END = 255
 
     TX_PARAM = 30

{whatap_python-1.7.9 → whatap_python-1.8.1}/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.8.1/whatap/trace/mod/application_starlette.py

@@ -0,0 +1,125 @@
+import whatap.net.async_sender as async_sender
+from whatap.trace.trace_context import TraceContext
+from whatap.trace.trace_context_manager import TraceContextManager
+from whatap.net.packet_type_enum import PacketTypeEnum
+from whatap.util.date_util import DateUtil
+from whatap.util.userid_util import UseridUtil as userid_util
+from whatap.trace.mod.application_wsgi import interceptor_step_error, \
+start_interceptor,end_interceptor
+from whatap.conf.configure import Configure as conf
+from typing import Any
+
+
+
+def intercept_websocket(web_socket, data: str):
+    try:
+        ctx = TraceContext()
+
+        scope = web_socket.scope
+        headers = dict(scope.get("headers", []))  # headers는 리스트(tuple) 형태
+        query_string = scope.get("query_string", b'').decode()
+        client = scope.get("client", ("0.0.0.0", 0))
+
+        # 기본 ctx 설정
+        ctx.service_name = scope.get("path", "WebSocket")
+        if query_string:
+            ctx.service_name += f"?{query_string}"
+        ctx.http_method = "WEBSOCKET"
+        ctx.remoteIp = client[0]
+        ctx.port = client[1]
+
+        # User-Agent, Referer 추출 (바이트를 디코딩)
+        ctx.userAgentString = headers.get(b'user-agent', b'').decode()
+        ctx.referer = headers.get(b'referer', b'').decode()
+
+        # userid 관련
+        if conf.trace_user_enabled:
+            if conf.trace_user_using_ip:
+                ctx.userid = ctx.remoteIp
+            else:
+                ctx.userid, ctx._rawuserid = userid_util.getUserId([scope], ctx.remoteIp)
+
+        # 트랜잭션 전파 관련
+        mstt = headers.get(f"HTTP_{conf._trace_mtrace_caller_key}".encode(), b'').decode()
+        if mstt:
+            ctx.setTransfer(mstt)
+            if conf.stat_mtrace_enabled:
+                val = headers.get(f"HTTP_{conf._trace_mtrace_info_key}".encode(), b'').decode()
+                if val:
+                    ctx.setTransferInfo(val)
+            txid = headers.get(f"HTTP_{conf._trace_mtrace_callee_key}".encode(), b'').decode()
+            if txid:
+                ctx.setTxid(txid)
+
+        poid = headers.get(f"HTTP_{conf._trace_mtrace_caller_poid_key}".encode(), b'').decode()
+        if poid:
+            ctx.mcaller_poid = poid
+
+        start_interceptor(ctx)
+
+        start_time = DateUtil.nowSystem()
+        ctx.start_time = start_time
+        ctx.error = 0
+        ctx.elapsed = 0
+
+        datas = [ctx.remoteIp, ctx.port, ctx.elapsed, ctx.error]
+        async_sender.send_packet(PacketTypeEnum.TX_WEB_SOCKET, ctx, datas)
+
+    except Exception as e:
+        interceptor_step_error(e)
+    finally:
+        end_interceptor(ctx=ctx)
+
+
+def instrument_starlette_websocket(module):
+
+    if not conf.trace_websocket_enabled:
+        return
+
+    OriginalWebSocket = module.WebSocket
+    if getattr(OriginalWebSocket, "_whatap_patched", False):
+        return
+
+    #original_accept = OriginalWebSocket.accept
+    original_send_text = OriginalWebSocket.send_text
+    original_send_bytes = OriginalWebSocket.send_bytes
+    original_send_json = OriginalWebSocket.send_json
+
+
+    # # 연결 시점도 래핑은 하지만, APM 인터셉트는 하지 않음
+    # async def wrapped_accept(self, *args, **kwargs):
+    #     try:
+    #         pass
+    #     except Exception as e:
+    #         interceptor_step_error(e)
+    #     return await original_accept(self, *args, **kwargs)
+
+    async def wrapped_send_text(self, data: str):
+        try:
+            intercept_websocket(self, data)
+        except Exception as e:
+            interceptor_step_error(e)
+        return await original_send_text(self, data)
+
+    async def wrapped_send_bytes(self, data: bytes):
+        try:
+            intercept_websocket(self, None)
+        except Exception as e:
+            interceptor_step_error(e)
+        return await original_send_bytes(self, data)
+
+    async def wrapped_send_json(self, data: Any):
+        try:
+            intercept_websocket(self, None)
+        except Exception as e:
+            interceptor_step_error(e)
+        return await original_send_json(self, data)
+
+    #OriginalWebSocket.accept = wrapped_accept
+    OriginalWebSocket.send_text = wrapped_send_text
+    OriginalWebSocket.send_bytes = wrapped_send_bytes
+    OriginalWebSocket.send_json = wrapped_send_json
+    OriginalWebSocket._whatap_patched = True
+
+
+

{whatap_python-1.7.9 → whatap_python-1.8.1}/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
 
@@ -53,11 +54,11 @@ class _ImportHookChainedLoader(object):
         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'):
@@ -78,7 +79,8 @@ class ImportFinder(object):
             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()

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

@@ -38,6 +38,9 @@ DEFINITION = {
         ('sqlalchemy.engine.create', 'instrument_sqlalchemy_engine_basic'),
         ('sqlalchemy.engine', 'instrument_sqlalchemy_engine_basic'),
     ],
+    'application_starlette' : [
+        ('starlette.websockets' , 'instrument_starlette_websocket'),
+    ],
     'application_wsgi': [
         ('', ''),
     ],

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

@@ -1,16 +1,18 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: whatap-python
-Version: 1.7.9
+Version: 1.8.1
 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.9 → whatap_python-1.8.1}/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_starlette.py
 whatap/trace/mod/application_tornado.py
 whatap/trace/mod/application_wsgi.py
 whatap/trace/mod/database_cxoracle.py

whatap_python-1.7.9/whatap/build.py

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