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

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

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

whatap_python-1.7.8/whatap/build.py

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

{whatap_python-1.7.7 → whatap_python-1.7.8}/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.8}/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.8}/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.8}/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.8}/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.8}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: whatap-python
-Version: 1.7.7
+Version: 1.7.8
 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'