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

{whatap-python-1.6.3 → whatap_python-1.6.5}/PKG-INFO

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

whatap_python-1.6.5/whatap/build.py

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

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

@@ -60,6 +60,10 @@ def getRemoteAddr(headers, whatap_dict):
         header_val = headers.get(conf.trace_http_client_ip_header_key)
         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:
+        return x_forwarded_for
     if whatap_dict:
         return whatap_dict.get(_REMOTE_ADDR)
 

{whatap-python-1.6.3 → whatap_python-1.6.5}/whatap/trace/mod/application_frappe.py

@@ -75,8 +75,11 @@ class UseridUtil(object):
             header_val = UseridUtil.getHeader(args, conf.trace_http_client_ip_header_key)
             if header_val:
                 return header_val.split(',')[0].strip()
-
+        x_forwarded_for = UseridUtil.getHeader(args, "x-forwarded-for")
+        if x_forwarded_for:
+            return x_forwarded_for.split(',')[0].strip()
         return UseridUtil.getHeader(args, "REMOTE_ADDR")
+        #return UseridUtil.getHeader(args, "REMOTE_ADDR")
 
     @staticmethod
     def getHeader(args, key):
@@ -84,7 +87,6 @@ class UseridUtil(object):
         if args:
             environ = args[0]
             wsgiHeaderKey = 'HTTP_'+key.upper().replace('-','_')
-            
             return environ.get(key, environ.get(wsgiHeaderKey))
         else:
             return None

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

@@ -200,45 +200,43 @@ def interceptor(rn_environ, *args, **kwargs):
     try:
 
         callback = fn(*args, **kwargs)
-        ctx = TraceContextManager.getLocalContext()
-        if ctx:
-            query_string = environ.get('QUERY_STRING', '')
-            if query_string:
-                ctx.service_name += '?{}'.format(query_string)
-
-            if ctx.service_name.find('.') > -1 and ctx.service_name.split('.')[
-                1] in conf.web_static_content_extensions:
-                ctx.isStaticContents = 'true'
-
-            if getattr(callback, 'status_code', None):
-                status_code = callback.status_code
-                errors = [callback.reason_phrase, callback.__class__.__name__]
-                interceptor_error(status_code, errors)
-
-            if conf.profile_http_header_enabled:
-                keys = []
-                for key, value in environ.items():
-                    if key.startswith('HTTP_'):
-                        keys.append(key)
-                keys.sort()
-
-                text = ''
-                for key in keys:
-                    text += '{}={}\n'.format(key.split('HTTP_')[1].lower(),
-                                             environ[key])
-
-                datas = ['HTTP-HEADERS', 'HTTP-HEADERS', text]
-                ctx.start_time = DateUtil.nowSystem()
-                async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
-            return callback
+        query_string = environ.get('QUERY_STRING', '')
+        if query_string:
+            ctx.service_name += '?{}'.format(query_string)
+
+        if ctx.service_name.find('.') > -1 and ctx.service_name.split('.')[
+            1] in conf.web_static_content_extensions:
+            ctx.isStaticContents = 'true'
+
+        if getattr(callback, 'status_code', None):
+            status_code = callback.status_code
+            errors = [callback.reason_phrase, callback.__class__.__name__]
+            interceptor_error(status_code, errors, ctx=ctx)
+
+        if conf.profile_http_header_enabled:
+            keys = []
+            for key, value in environ.items():
+                if key.startswith('HTTP_'):
+                    keys.append(key)
+            keys.sort()
+
+            text = ''
+            for key in keys:
+                text += '{}={}\n'.format(key.split('HTTP_')[1].lower(),
+                                            environ[key])
+
+            datas = ['HTTP-HEADERS', 'HTTP-HEADERS', text]
+            ctx.start_time = DateUtil.nowSystem()
+            async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
+        return callback
     finally:
-        ctx = TraceContextManager.getLocalContext()
-        if ctx:
-            end_interceptor(ctx=ctx)
+        end_interceptor(ctx=ctx)
 
-
-def interceptor_error(status_code, errors):
-    ctx = TraceContextManager.getLocalContext()
+def interceptor_error(status_code, errors, ctx = None):
+    if not ctx:
+        ctx = TraceContextManager.getLocalContext()
+    if not ctx:
+        return
     ctx.status = int(status_code / 100)
     if ctx.status >= 4 and not ctx.error:
         ctx.error = 1

{whatap-python-1.6.3 → whatap_python-1.6.5}/whatap/util/userid_util.py

@@ -126,5 +126,8 @@ class UseridUtil(object):
             header_val = UseridUtil.getHeader(args, conf.trace_http_client_ip_header_key)
             if header_val:
                 return header_val.split(',')[0].strip()
-
-        return UseridUtil.getHeader(args, "REMOTE_ADDR")
+        x_forwarded_for = UseridUtil.getHeader(args, "x-forwarded-for")
+        if x_forwarded_for:
+            return x_forwarded_for.split(',')[0].strip()
+        return UseridUtil.getHeader(args, "REMOTE_ADDR")
+        #return UseridUtil.getHeader(args, "REMOTE_ADDR")

{whatap-python-1.6.3 → whatap_python-1.6.5}/whatap_python.egg-info/PKG-INFO

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

whatap-python-1.6.3/whatap/build.py

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