whatap-python 1.6.5__tar.gz → 1.6.7__tar.gz

{whatap_python-1.6.5 → whatap_python-1.6.7}/PKG-INFO

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

whatap_python-1.6.7/whatap/build.py

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

{whatap_python-1.6.5 → whatap_python-1.6.7}/whatap/net/async_sender.py

@@ -1,3 +1,4 @@
+import copy
 import queue, time, threading
 from . import udp_session
 from whatap.conf.configure import Configure as conf
@@ -11,12 +12,15 @@ class SendType(Enum):
     RELAY = 2
 
 def send_packet( packet_type, ctx, datas=[]):
-    ctx = SimpleTraceContext(ctx.id, ctx.start_time, ctx.elapsed, ctx.thread_id)
+    ctx = SimpleTraceContext(ctx)
+
+    # deep coopy TraceContext object before adding it to the queue, preventing potential data overwriting issues caused by concurrent modifications
+    copied_ctx = ctx.getDeepCopiedContext()
     _initThread()
     global q
     if q.full():
         return
-    q.put((SendType.DATAS, (packet_type, ctx, datas)))
+    q.put((SendType.DATAS, (packet_type, copied_ctx, datas)))
 
 def send_relaypack( packbytes):
     _initThread()

{whatap_python-1.6.5 → whatap_python-1.6.7}/whatap/trace/mod/application_fastapi.py

@@ -61,8 +61,8 @@ def getRemoteAddr(headers, whatap_dict):
         if header_val:
             return header_val.split(',')[0].strip()
     x_forwarded_for = headers.get("x-forwarded-for")
-    x_forwarded_for = x_forwarded_for.split(',')[0].strip() if ',' in x_forwarded_for else None
     if x_forwarded_for:
+        x_forwarded_for = x_forwarded_for.split(',')[0].strip() if ',' in x_forwarded_for else None
         return x_forwarded_for
     if whatap_dict:
         return whatap_dict.get(_REMOTE_ADDR)

{whatap_python-1.6.5 → whatap_python-1.6.7}/whatap/trace/mod/application_wsgi.py

@@ -210,7 +210,7 @@ def interceptor(rn_environ, *args, **kwargs):
 
         if getattr(callback, 'status_code', None):
             status_code = callback.status_code
-            errors = [callback.reason_phrase, callback.__class__.__name__]
+            errors = [callback.__class__.__name__, callback.reason_phrase]
             interceptor_error(status_code, errors, ctx=ctx)
 
         if conf.profile_http_header_enabled:

whatap_python-1.6.7/whatap/trace/simple_trace_context.py

@@ -0,0 +1,18 @@
+import copy
+
+from whatap.trace.trace_context import TraceContext
+
+
+class SimpleTraceContext(TraceContext):
+    def __init__(self, ctx: TraceContext):
+        self.ctx = ctx
+
+    """
+    Replaced Python's built-in deepcopy function with a manual deep copy method in SimpleTraceContext.
+    This change prevents potential pickle errors when serializing the TraceContext object.
+    Each attribute is copied individually to ensure that complex objects within TraceContext are correctly handled.
+    """
+    def getDeepCopiedContext(self):
+        for key, value in self.ctx.__dict__.items():
+            setattr(self, key, value)
+        return self

{whatap_python-1.6.5 → whatap_python-1.6.7}/whatap_python.egg-info/PKG-INFO

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

whatap_python-1.6.5/whatap/build.py

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

whatap_python-1.6.5/whatap/trace/simple_trace_context.py

@@ -1,9 +0,0 @@
-from whatap.trace.trace_context import TraceContext
-
-
-class SimpleTraceContext(TraceContext):
-    def __init__(self, id, start_time, elapsed, thread_id):
-        self.id = id
-        self.start_time = start_time
-        self.elapsed = elapsed
-        self.thread_id = thread_id

{whatap_python-1.6.5 → whatap_python-1.6.7}/whatap/trace/mod/application_django.py

@@ -146,6 +146,7 @@ def instrument_handlers_base(module):
                       e[1].args[1] if len(
                           e[1].args) > 1 \
                           else repr(e[1].args[0])]
+
             interceptor_error(status_code, errors)
             
             return callback
@@ -202,7 +203,6 @@ def instrument_generic_base(module):
             try:
                 callback = fn(*args, **kwargs)
             except Exception as e:
-
                 interceptor_step_error(e, ctx = ctx)
                 raise e
             return callback