whatap-python 1.8.7__tar.gz → 1.8.9__tar.gz

{whatap_python-1.8.7 → whatap_python-1.8.9}/PKG-INFO

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

{whatap_python-1.8.7 → whatap_python-1.8.9}/whatap/__init__.py

@@ -340,10 +340,10 @@ def hooks(home):
 
             if conf.standalone_enabled:
                 if conf.standalone_type == 'multiple-transaction':
-                    from whatap.trace.mod.standalone_multiple import instrument_standalone_multiple
+                    from whatap.trace.mod.standalone.multiple import instrument_standalone_multiple
                     instrument_standalone_multiple()
                 else:
-                    from whatap.trace.mod.standalone_single import instrument_standalone_single
+                    from whatap.trace.mod.standalone.single import instrument_standalone_single
                     instrument_standalone_single()
         
         except Exception as e:
@@ -453,9 +453,9 @@ def go(batch=False, opts={}):
 
 import signal
 
-from whatap.trace.mod.application_wsgi import interceptor, start_interceptor, \
+from whatap.trace.mod.application.wsgi import interceptor, start_interceptor, \
     end_interceptor, trace_handler, interceptor_step_error
-from whatap.trace.mod.application_fastapi import interceptor_error_log
+from whatap.trace.mod.application.fastapi import interceptor_error_log
 from whatap.trace.trace_context import TraceContext, TraceContextManager
 
 def register_app(fn):

whatap_python-1.8.9/whatap/build.py

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

{whatap_python-1.8.7 → whatap_python-1.8.9}/whatap/conf/configuration.py

@@ -4,6 +4,7 @@ Configuration = {
     "ignore_whatap_stdout" : False,
     "net_udp_port": "6600",
     "web_static_content_extensions": "js, htm, html, gif, png, jpg, css, swf, ico",
+
     "trace_auto_normalize_enabled": True,
     "trace_user_enabled": True,
     "trace_user_using_ip": True,
@@ -15,6 +16,8 @@ Configuration = {
     "trace_ignore_url_prefix": None,
     "trace_websocket_enabled": False,
 
+    "trace_llm_log_enabled": False,
+
     "debug": False,
     "query_string_enabled": False,
     "query_string_urls": "",

whatap_python-1.8.7/whatap/trace/mod/amqp_kombu.py → whatap_python-1.8.9/whatap/trace/mod/amqp/kombu.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.7/whatap/trace/mod/amqp_pika.py → whatap_python-1.8.9/whatap/trace/mod/amqp/pika.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.7/whatap/trace/mod/application_bottle.py → whatap_python-1.8.9/whatap/trace/mod/application/bottle.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 
 

whatap_python-1.8.7/whatap/trace/mod/application_celery.py → whatap_python-1.8.9/whatap/trace/mod/application/celery.py

@@ -1,7 +1,7 @@
 from functools import wraps
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager
-from whatap.trace.mod.application_wsgi import start_interceptor, end_interceptor, interceptor_step_error
+from whatap.trace.mod.application.wsgi import start_interceptor, end_interceptor, interceptor_step_error
 from whatap import logging
 from whatap.conf.configure import Configure as conf
 import time

whatap_python-1.8.7/whatap/trace/mod/application_cherrypy.py → whatap_python-1.8.9/whatap/trace/mod/application/cherrypy.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 
 

whatap_python-1.8.7/whatap/trace/mod/application_django.py → whatap_python-1.8.9/whatap/trace/mod/application/django.py

@@ -1,7 +1,7 @@
 from whatap.conf.configure import Configure as conf
 from whatap.net.packet_type_enum import PacketTypeEnum
 import whatap.net.async_sender as async_sender
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error, interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
@@ -76,7 +76,7 @@ def instrument_asgi(module):
     module.ASGIHandler.__call__ = wrapper(module.ASGIHandler.__call__)
 
 try:
-    from whatap.trace.mod.application_django_py3 import \
+    from whatap.trace.mod.application.django_py3 import \
         instrument_handlers_async, interceptor_async,\
         trace_handler_async, blocking_handler_async,\
         parseHeaders as parseHeadersAsync,\
@@ -84,7 +84,7 @@ try:
     
     django_py3_loaded = True
 except Exception as e:
-    print("application_django error:",e)
+    print("application.django error:",e)
     django_py3_loaded = False
 
 def instrument_handlers_channels(module):

whatap_python-1.8.7/whatap/trace/mod/application_django_asgi.py → whatap_python-1.8.9/whatap/trace/mod/application/django_asgi.py

@@ -4,7 +4,7 @@ from whatap.conf.configure import Configure as conf
 from whatap.net import async_sender
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
-from whatap.trace.mod.application_wsgi import isIgnore, start_interceptor, end_interceptor
+from whatap.trace.mod.application.wsgi import isIgnore, start_interceptor, end_interceptor
 from whatap.util.hash_util import HashUtil as hash_util
 from whatap.util.userid_util import UseridUtil
 from whatap.util.date_util import DateUtil

whatap_python-1.8.7/whatap/trace/mod/application_django_py3.py → whatap_python-1.8.9/whatap/trace/mod/application/django_py3.py

@@ -2,7 +2,7 @@
 from whatap.conf.configure import Configure as conf
 from whatap.trace.trace_context_manager import TraceContextManager
 from whatap.trace.trace_context import TraceContext
-from whatap.trace.mod.application_wsgi import \
+from whatap.trace.mod.application.wsgi import \
     interceptor_error,isIgnore, start_interceptor, end_interceptor
 from whatap.util.hash_util import HashUtil as hash_util
 from whatap.util.userid_util import UseridUtil

whatap_python-1.8.7/whatap/trace/mod/application_fastapi.py → whatap_python-1.8.9/whatap/trace/mod/application/fastapi.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_error, start_interceptor, end_interceptor, \
     isIgnore, interceptor_step_error
 from copy import copy

whatap_python-1.8.7/whatap/trace/mod/application_flask.py → whatap_python-1.8.9/whatap/trace/mod/application/flask.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, \
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, \
     interceptor_error
 from whatap.trace.trace_context_manager import TraceContextManager
 

whatap_python-1.8.7/whatap/trace/mod/application_frappe.py → whatap_python-1.8.9/whatap/trace/mod/application/frappe.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_error, start_interceptor, isIgnore, \
     end_interceptor
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.7/whatap/trace/mod/application_graphql.py → whatap_python-1.8.9/whatap/trace/mod/application/graphql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.7/whatap/trace/mod/application_nameko.py → whatap_python-1.8.9/whatap/trace/mod/application/nameko.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error, start_interceptor, end_interceptor
 from whatap.trace.trace_context import TraceContext
 from whatap.trace.trace_context_manager import TraceContextManager

whatap_python-1.8.7/whatap/trace/mod/application_odoo.py → whatap_python-1.8.9/whatap/trace/mod/application/odoo.py

@@ -1,5 +1,5 @@
 import traceback
-from whatap.trace.mod.application_wsgi import interceptor, trace_handler, interceptor_error
+from whatap.trace.mod.application.wsgi import interceptor, trace_handler, interceptor_error
 from whatap.trace.trace_context_manager import TraceContextManager
 
 

whatap_python-1.8.7/whatap/trace/mod/application_starlette.py → whatap_python-1.8.9/whatap/trace/mod/application/starlette.py

@@ -4,7 +4,7 @@ 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, \
+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

whatap_python-1.8.7/whatap/trace/mod/application_tornado.py → whatap_python-1.8.9/whatap/trace/mod/application/tornado.py

@@ -6,7 +6,7 @@ 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, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     start_interceptor, end_interceptor, interceptor_error, isIgnore
 
 

whatap_python-1.8.7/whatap/trace/mod/application_wsgi.py → whatap_python-1.8.9/whatap/trace/mod/application/wsgi.py

@@ -403,11 +403,17 @@ def interceptor_db_con(fn, db_info, *args, **kwargs):
         kwargs = dict(
             x.split('=') for x in re.sub(r'\s*=\s*', '=', args[0]).split())
 
-    text = '{}://'.format(db_info.get('type'))
-    text += kwargs.get('user' , '')
-    text += "@"
-    text += kwargs.get('host', kwargs.get('dsn', ''))
-    text += '/'
+    db_type = db_info.get('type')
+
+    if db_type == "sqlite":
+        text = "sqlite:"
+    else:
+        text = '{}://'.format(db_type)
+        text += kwargs.get('user', '')
+        text += "@"
+        text += kwargs.get('host', kwargs.get('dsn', ''))
+        text += '/'
+
     text += kwargs.get('database', kwargs.get('db', kwargs.get('dbname', '')))
     ctx.active_dbc = text
     ctx.lctx['dbc'] = text
@@ -445,14 +451,58 @@ def addQuoteList(arg_list):
     return tuple(quoted_list)
 
 def neo4jQuery(query,paremeter):
-    transformed_query = query
+    neo4j_query = query
 
     for key, value in paremeter.items():
         placeholder = f"${key}"
         replacement = f"'{str(value)}'"
-        transformed_query = transformed_query.replace(placeholder, replacement)
-
-    return transformed_query
+        neo4j_query = neo4j_query.replace(placeholder, replacement)
+
+    return neo4j_query
+
+def sqliteQuery(query, paremeter):
+    sqlite_query = query
+
+    def quote(v):
+        if v is None: return "NULL"
+        if isinstance(v, (bytes, bytearray)): return "X'" + v.hex() + "'"
+        return "'" + str(v).replace("'", "''") + "'"
+
+    # 이름 기반: :name / @name / $name (단일 세트)
+    if isinstance(paremeter, dict):
+        for pfx in (':', '@', '$'):
+            for k, v in paremeter.items():
+                sqlite_query = sqlite_query.replace(f"{pfx}{k}", quote(v))
+        return sqlite_query
+
+    # 포지셔널 + executemany 분기
+    if isinstance(paremeter, (list, tuple)):
+        # ── executemany: [tuple|dict, ...] ──
+        if isinstance(paremeter, list) and paremeter and isinstance(paremeter[0], (tuple, dict)):
+            stmts = []
+            for params in paremeter:
+                sqlite_query = query
+                if isinstance(params, dict):
+                    for pfx in (':', '@', '$'):
+                        for k, v in params.items():
+                            sqlite_query = sqlite_query.replace(f"{pfx}{k}", quote(v))
+                else:  # tuple
+                    for i, v in enumerate(params, 1):
+                        sqlite_query = sqlite_query.replace(f"?{i}", quote(v))
+                    for v in params:
+                        sqlite_query = sqlite_query.replace('?', quote(v), 1)
+                stmts.append(sqlite_query)
+            return ";\n".join(stmts)
+
+        # ── 단일 포지셔널 세트 (tuple 또는 스칼라 list) ──
+        seq = paremeter if isinstance(paremeter, tuple) else tuple(paremeter)
+        for i, v in enumerate(seq, 1):
+            sqlite_query = sqlite_query.replace(f"?{i}", quote(v))
+        for v in seq:
+            sqlite_query = sqlite_query.replace('?', quote(v), 1)
+        return sqlite_query
+
+    return sqlite_query
 
 def interceptor_db_execute(fn, db_info, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
@@ -466,6 +516,13 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
             query = neo4jQuery(args[1], kwargs)
         except Exception as e:
             pass
+
+    elif db_type == "sqlite" and len(args) > 2:
+        try:
+            query = sqliteQuery(args[1],args[2])
+        except Exception as e:
+            pass
+
     else:
         if len(args) > 2 and type(args[2]) == dict and args[2]:
             try:
@@ -486,24 +543,6 @@ def interceptor_db_execute(fn, db_info, *args, **kwargs):
     if not query:
         return fn(*args, **kwargs)
 
-    start_time = DateUtil.nowSystem()
-    ctx.start_time = start_time
-
-    text = '{}://'.format(db_info.get('type'))
-    text += db_info.get('user' , '')
-    text += "@"
-    text += db_info.get('host', db_info.get('dsn', ''))
-    text += '/'
-    text += db_info.get('database', db_info.get('db', db_info.get('dbname', '')))
-    ctx.active_dbc = text
-    ctx.lctx['dbc'] = text
-
-    ctx.active_dbc = 0
-
-    datas = [text]
-    ctx.elapsed = DateUtil.nowSystem() - start_time
-    async_sender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, datas)
-
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
     ctx.active_sqlhash = query

whatap_python-1.8.7/whatap/trace/mod/database_cxoracle.py → whatap_python-1.8.9/whatap/trace/mod/database/cxoracle.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.7/whatap/trace/mod/database_mongo.py → whatap_python-1.8.9/whatap/trace/mod/database/mongo.py

@@ -1,6 +1,6 @@
 import pymongo.monitoring
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender

whatap_python-1.8.7/whatap/trace/mod/database_mysql.py → whatap_python-1.8.9/whatap/trace/mod/database/mysql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.7/whatap/trace/mod/database_neo4j.py → whatap_python-1.8.9/whatap/trace/mod/database/neo4j.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import (
+from whatap.trace.mod.application.wsgi import (
     trace_handler,
     interceptor_db_con,
     interceptor_db_execute,

whatap_python-1.8.7/whatap/trace/mod/database_postgresql.py → whatap_python-1.8.9/whatap/trace/mod/database/postgresql.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_db_con, interceptor_db_execute, interceptor_db_close
 
 db_info = {}

whatap_python-1.8.7/whatap/trace/mod/database_redis.py → whatap_python-1.8.9/whatap/trace/mod/database/redis.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, interceptor_step_error
+from whatap.trace.mod.application.wsgi import trace_handler, interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender
 from whatap.net.packet_type_enum import PacketTypeEnum

whatap_python-1.8.9/whatap/trace/mod/database/sqlite3.py

@@ -0,0 +1,124 @@
+from whatap.trace.mod.application.wsgi import trace_handler, \
+    interceptor_db_con, interceptor_db_execute, interceptor_db_close
+
+class CursorProxy:
+    def __init__(self, real_cursor, db_info):
+        self._cur = real_cursor
+        self._db_info = db_info
+
+    def execute_wrapper(self, original_execute_method):
+        owner = getattr(original_execute_method, "__self__", None)
+
+        def safe_execute(*args, **kwargs):
+            if args and owner is not None and args[0] is owner:
+                args = args[1:]
+            return original_execute_method(*args, **kwargs)
+
+        return safe_execute
+
+    def execute(self, *args, **kwargs):
+        safe_fn = self.execute_wrapper(self._cur.execute)
+        callback = interceptor_db_execute(safe_fn, self._db_info, self._cur, *args, **kwargs)
+        return callback
+
+    def executemany(self, *args, **kwargs):
+        safe_fn = self.execute_wrapper(self._cur.executemany)
+        callback = interceptor_db_execute(safe_fn, self._db_info, self._cur, *args, **kwargs)
+        return callback
+
+    def executescript(self, *args, **kwargs):
+        safe_fn = self.execute_wrapper(self._cur.executescript)
+        callback = interceptor_db_execute(safe_fn, self._db_info, self._cur, *args, **kwargs)
+        return callback
+
+    def close(self, *args, **kwargs):
+        callback = self._cur.close(*args, **kwargs)
+        return callback
+
+    def __enter__(self):
+        self._cur.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return self._cur.__exit__(exc_type, exc_val, exc_tb)
+
+    def __getattr__(self, name):
+        return getattr(self._cur, name)
+
+
+class ConnectionProxy:
+    def __init__(self, real_connection, db_info):
+        self._real_connection = real_connection
+        self._db_info = db_info
+
+    def execute_wrapper(self, original_execute_method):
+        owner = getattr(original_execute_method, "__self__", None)
+
+        def safe_execute(*args, **kwargs):
+            if args and owner is not None and args[0] is owner:
+                args = args[1:]
+            return original_execute_method(*args, **kwargs)
+
+        return safe_execute
+
+    def execute(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.execute)
+        callback = interceptor_db_execute(safe_fn,self._db_info,real_cursor,*args,**kwargs)
+        return callback
+
+    def executemany(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.executemany)
+        callback = interceptor_db_execute(safe_fn, self._db_info, real_cursor, *args, **kwargs)
+        return callback
+
+    def executescript(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor()
+        safe_fn = self.execute_wrapper(real_cursor.executescript)
+        callback = interceptor_db_execute(safe_fn, self._db_info, real_cursor, *args, **kwargs)
+        return callback
+
+    def cursor(self, *args, **kwargs):
+        real_cursor = self._real_connection.cursor(*args, **kwargs)
+        return CursorProxy(real_cursor, self._db_info)
+
+    def close(self, *args, **kwargs):
+        callback = interceptor_db_close(self._real_connection.close, *args, **kwargs)
+        return callback
+
+    def __getattr__(self, name):
+        return getattr(self._real_connection, name)
+
+    def __enter__(self):
+        self._real_connection.__enter__()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        return self._real_connection.__exit__(exc_type, exc_val, exc_tb)
+
+
+def instrument_sqlite3(module):
+
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            if args:
+                kwargs['database'] = args[0]
+                args = args[1:]
+
+            db_name = kwargs.get('database', 'unknown')
+            db_info = {'type': 'sqlite', 'db': db_name}
+            db_info.update(kwargs)
+
+            real_connection = interceptor_db_con(fn, db_info, *args, **kwargs)
+
+            if real_connection:
+                return ConnectionProxy(real_connection, db_info)
+
+            return real_connection
+
+        return trace
+
+    if hasattr(module, "connect"):
+        module.connect = wrapper(module.connect)

whatap_python-1.8.7/whatap/trace/mod/database_toolkit.py → whatap_python-1.8.9/whatap/trace/mod/database/toolkit.py

@@ -1,6 +1,6 @@
 from whatap.net.packet_type_enum import PacketTypeEnum
 import whatap.net.async_sender as async_sender
-from whatap.trace.mod.application_wsgi import trace_handler, interceptor_db_execute, interceptor_step_error, sendDebugProfile
+from whatap.trace.mod.application.wsgi import trace_handler, interceptor_db_execute, interceptor_step_error, sendDebugProfile
 from whatap.util.date_util import DateUtil
 from whatap.trace.trace_context_manager import TraceContextManager
 import sys

whatap_python-1.8.7/whatap/trace/mod/email_smtp.py → whatap_python-1.8.9/whatap/trace/mod/email/smtp.py

@@ -1,5 +1,5 @@
 from whatap.trace import get_dict
-from whatap.trace.mod.application_wsgi import trace_handler, \
+from whatap.trace.mod.application.wsgi import trace_handler, \
     interceptor_step_error
 from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender

whatap_python-1.8.7/whatap/trace/mod/httpc_django.py → whatap_python-1.8.9/whatap/trace/mod/httpc/django.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request
 
 

whatap_python-1.8.7/whatap/trace/mod/httpc_httplib.py → whatap_python-1.8.9/whatap/trace/mod/httpc/httplib.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request, interceptor_sock_connect
 
 request_injection_processed = False

whatap_python-1.8.9/whatap/trace/mod/httpc/httpx.py

@@ -0,0 +1,24 @@
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
+    interceptor_httpc_request
+
+
+def instrument_httpx(module):
+    def wrapper(fn):
+        @trace_handler(fn)
+        def trace(*args, **kwargs):
+            request = args[1]
+            request.headers = transfer(request.headers)
+
+            httpc_url = str(request.url)
+            callback = interceptor_httpc_request(fn, httpc_url, *args, **kwargs)
+
+            return callback
+
+        return trace
+
+    if hasattr(module, 'Client') and hasattr(module.Client, 'send'):
+        module.Client.send = wrapper(module.Client.send)
+
+
+    if hasattr(module, 'AsyncClient') and hasattr(module.AsyncClient, 'send'):
+        module.AsyncClient.send = wrapper(module.AsyncClient.send)

whatap_python-1.8.7/whatap/trace/mod/httpc_requests.py → whatap_python-1.8.9/whatap/trace/mod/httpc/requests.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, trace_handler, \
+from whatap.trace.mod.application.wsgi import transfer, trace_handler, \
     interceptor_httpc_request
 
 

whatap_python-1.8.7/whatap/trace/mod/httpc_urllib3.py → whatap_python-1.8.9/whatap/trace/mod/httpc/urllib3.py

@@ -1,4 +1,4 @@
-from whatap.trace.mod.application_wsgi import transfer, interceptor_httpc_request, \
+from whatap.trace.mod.application.wsgi import transfer, interceptor_httpc_request, \
     trace_handler, interceptor_sock_connect