whatap-python 1.5.4__tar.gz → 1.5.6__tar.gz

{whatap-python-1.5.4 → whatap-python-1.5.6}/PKG-INFO

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

{whatap-python-1.5.4 → whatap-python-1.5.6}/whatap/__init__.py

@@ -51,7 +51,9 @@ def whatap_print(*args):
     if isFrappeCommands:
         logging.info(*args)
     else:
-        print(*args)
+        if len(args) > 0:
+            message = " ".join(args)
+            print(message)
 
 class Logger(object):
     def __init__(self):
@@ -370,7 +372,7 @@ def go(batch=False, opts={}):
         process = subprocess.Popen(['./{0}'.format(AGENT_NAME), '-t', '3', '-d', '1'],
                                    cwd=home_path,env=newenv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdouts, errs = process.communicate()
-        whatap_print("executed golang module ", stdouts, errs)
+        whatap_print("executed golang module ", str(stdouts,"utf8"), str(errs, "utf8"))
     except Exception as e:
         import traceback
         traceback.print_exc()

whatap-python-1.5.6/whatap/build.py

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

{whatap-python-1.5.4 → whatap-python-1.5.6}/whatap/trace/mod/application_wsgi.py

@@ -375,7 +375,6 @@ def interceptor_db_con(fn, db_type, *args, **kwargs):
     try:
         callback = fn(*args, **kwargs)
     finally:
-
         ctx.db_opening = False
 
     if not kwargs:
@@ -387,7 +386,7 @@ def interceptor_db_con(fn, db_type, *args, **kwargs):
     text += "@"
     text += kwargs.get('host')
     text += '/'
-    text += kwargs.get('database', kwargs.get('db', kwargs.get('dbname')))
+    text += kwargs.get('database', kwargs.get('db', kwargs.get('dbname', '')))
     ctx.active_dbc = text
     ctx.lctx['dbc'] = text
 

{whatap-python-1.5.4 → whatap-python-1.5.6}/whatap/trace/mod/database_toolkit.py

@@ -3,6 +3,7 @@ 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.util.date_util import DateUtil
 from whatap.trace.trace_context_manager import TraceContextManager
+import sys
 from functools import wraps
 
 def instrument_sqlalchemy(module):
@@ -25,8 +26,8 @@ def instrument_sqlalchemy(module):
             return callback
         
         return trace
-    
-    module.Session.get_bind = wrapper(module.Session.get_bind)
+    if sys.modules.get("flask_sqlalchemy") is None:
+        module.Session.get_bind = wrapper(module.Session.get_bind)
 
 def addQuote(arg_dict):
     quoted_dict = dict()
@@ -60,7 +61,6 @@ def instrument_sqlalchemy_engine(module):
                         query = args[2] % addQuote(args[3])
                 except Exception as e:
                     pass
-            print(f"query:{query}")
             # print('instrument_sqlalchemy_engine 2:', query)
             try:
                 if not query:

{whatap-python-1.5.4 → whatap-python-1.5.6}/whatap_python.egg-info/PKG-INFO

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

whatap-python-1.5.4/whatap/build.py

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