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

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

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

{whatap_python-1.8.0 → whatap_python-1.8.2}/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.2/whatap/build.py

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

{whatap_python-1.8.0 → whatap_python-1.8.2}/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.8.0 → whatap_python-1.8.2}/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.8.2/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.8.0 → whatap_python-1.8.2}/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.8.0 → whatap_python-1.8.2}/whatap_python.egg-info/PKG-INFO

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

{whatap_python-1.8.0 → whatap_python-1.8.2}/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.8.0/whatap/build.py

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