cavisson-pythonagent 0.0.1__tar.gz → 0.0.2__tar.gz

cavisson_pythonagent-0.0.2/MANIFEST.in

@@ -0,0 +1,2 @@
+graft pythonagent/cavisson
+graft pythonagent/bootstrap/native_libs

{cavisson_pythonagent-0.0.1/cavisson_pythonagent.egg-info → cavisson_pythonagent-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: cavisson-pythonagent
-Version: 0.0.1
+Version: 0.0.2
 Summary: A small example package
 Home-page: https://github.com/pypa/sampleproject
 Author: Cavisson System
@@ -15,15 +15,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-python
-Dynamic: summary
 
 # Example Package
 

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2/cavisson_pythonagent.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: cavisson-pythonagent
-Version: 0.0.1
+Version: 0.0.2
 Summary: A small example package
 Home-page: https://github.com/pypa/sampleproject
 Author: Cavisson System
@@ -15,15 +15,6 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=2.6, !=3.0.*, !=3.1.*, !=3.2.*
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license-file
-Dynamic: requires-python
-Dynamic: summary
 
 # Example Package
 

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/cavisson_pythonagent.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ setup.py
 cavisson_pythonagent.egg-info/PKG-INFO
 cavisson_pythonagent.egg-info/SOURCES.txt
 cavisson_pythonagent.egg-info/dependency_links.txt
+cavisson_pythonagent.egg-info/entry_points.txt
 cavisson_pythonagent.egg-info/top_level.txt
 pythonagent/__init__.py
 pythonagent/config.py
@@ -32,14 +33,11 @@ pythonagent/agent/internal/provider.py
 pythonagent/agent/internal/thread_dump.py
 pythonagent/agent/internal/udp.py
 pythonagent/agent/internal/udp_message.py
-pythonagent/agent/internal/metadata/__init__.py
-pythonagent/agent/internal/metadata/agent_meta_data.py
 pythonagent/agent/probes/__init__.py
 pythonagent/agent/probes/base.py
 pythonagent/agent/probes/span.py
 pythonagent/agent/probes/Instrumentation/__init__.py
 pythonagent/agent/probes/Instrumentation/find.py
-pythonagent/agent/probes/Instrumentation/module_version_resolver.py
 pythonagent/agent/probes/Instrumentation/new_parser.py
 pythonagent/agent/probes/Instrumentation/parser.py
 pythonagent/agent/probes/cache/__init__.py
@@ -106,7 +104,27 @@ pythonagent/bootstrap/__init__.py
 pythonagent/bootstrap/cav_gunicorn.py
 pythonagent/bootstrap/cavagent_lambda_wrapper.py
 pythonagent/bootstrap/run.py
+pythonagent/bootstrap/setup_native_libs.py
 pythonagent/bootstrap/sitecustomize.py
+pythonagent/bootstrap/native_libs/alpine/libcavapr-1.so
+pythonagent/bootstrap/native_libs/alpine/libcrypto.so.3
+pythonagent/bootstrap/native_libs/alpine/libssl.so.3
+pythonagent/bootstrap/native_libs/alpine/libuuid.so.1
+pythonagent/bootstrap/native_libs/alpine/libwebsockets.so
+pythonagent/bootstrap/native_libs/debian/libcavapr-1.so
+pythonagent/bootstrap/native_libs/debian/libcrypto.so.1.1
+pythonagent/bootstrap/native_libs/debian/libssl.so.1.1
+pythonagent/bootstrap/native_libs/debian/libwebsockets.so
+pythonagent/bootstrap/native_libs/opensuse/libcavapr-1.so
+pythonagent/bootstrap/native_libs/opensuse/libndsdk_py.so
+pythonagent/bootstrap/native_libs/opensuse/libwebsockets.so
+pythonagent/bootstrap/native_libs/oracle-linux/libcavapr-1.so
+pythonagent/bootstrap/native_libs/oracle-linux/libcrypto.so.1.1
+pythonagent/bootstrap/native_libs/oracle-linux/libssl.so.1.1
+pythonagent/bootstrap/native_libs/oracle-linux/libwebsockets.so
+pythonagent/bootstrap/native_libs/sles/libcavapr-1.so
+pythonagent/bootstrap/native_libs/sles/libndsdk_py.so
+pythonagent/bootstrap/native_libs/sles/libwebsockets.so
 pythonagent/cavisson/netdiagnostics/CavAgent/instrumentationprofile.json
 pythonagent/cavisson/netdiagnostics/CavAgent/interceptor_points.txt
 pythonagent/cavisson/netdiagnostics/python/CavAgent/instrumentationprofile.json

cavisson_pythonagent-0.0.2/cavisson_pythonagent.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+cavagent-setup-libs = pythonagent.bootstrap.setup_native_libs:main

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/internal/agent.py

@@ -12,7 +12,6 @@ from pythonagent.agent.internal import udp
 from pythonagent.agent.internal.provider import ContextProvider, CurrentBTProvider, StatusCodeProvider
 from pythonagent.agent.probes.frameworks import wsgi  # aiflagset
 from pythonagent.agent.probes.Instrumentation.find import find
-from pythonagent.agent.internal.metadata.agent_meta_data import build_metadata_block
 from pythonagent.utils import generate_flow_path_id, get_utf8_bytes, get_current_timestamp_in_us, process_raw_havoc_message
 import threading,gc
 from pythonagent.agent.internal.proc_compat import get_rss_bytes
@@ -850,18 +849,6 @@ class Agent(object):
 
         output_from_ad_c = create_string_buffer(get_utf8_bytes(output_from_ad))
         self.lib.wraphandleMessageForDiscovery(output_from_ad_c)
-
-        # Metadata must be sent before the "totalTimeTaken=...;" summary line below - that line is
-        # treated by the collector as the terminal response for this discovery request, so anything
-        # sent after it would never be attached to the .adr output. Defensive try/except so a
-        # metadata-collection failure never breaks the rest of auto-discovery.
-        try:
-            metadata_block_c = create_string_buffer(get_utf8_bytes(build_metadata_block(self)))
-            self.lib.wraphandleMessageForDiscovery(metadata_block_c)
-            del metadata_block_c
-        except Exception as e:
-            self.logger.exception("Error building/sending auto-discovery metadata block")
-
         self.logger.info("ad sending summary")
         ad_summary_c = create_string_buffer(get_utf8_bytes(ad_summary))
         self.lib.wraphandleMessageForDiscovery(ad_summary_c)
@@ -1100,11 +1087,12 @@ class Agent(object):
 
 
         if not bt:
-            self.logger.warning("BT is None. Either Test Run is stopped or Connection is broken")
+            self.logger.debug("nd_bt_begin returned NULL; skipping instrumentation for this transaction (test run is not active or internal connection error)")
+        else:
+            self.active_bts.add(bt)
         #self.logger.info("bt datatype : {0}".format(type(bt)))
         #print("btname value: {0}".format(btname))
         # print('-----------------\nCurrent heap memory stack for BT: ',bt_name,' is : ',hpy().heap())
-        self.active_bts.add(bt)
         self.set_current_bt(bt)
         #print("BT value of this txn: ", bt)
         return bt
@@ -1177,7 +1165,7 @@ class Agent(object):
             bt = udp.start_business_transaction(self, urlinfo, correlation_header)
 
         try:
-            if self.cav_env == "NATIVE":
+            if self.cav_env == "NATIVE" and bt:
                 url, http_method = str(urlinfo).rsplit("|", 1) if "|" in str(urlinfo) else (urlinfo, "")
                 btname_value = self.get_bt_name(
                     get_utf8_bytes(url),

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/Instrumentation/find.py

@@ -7,7 +7,6 @@ import time
 import pyclbr
 import datetime
 from pythonagent.agent.internal.proc_compat import get_process_name
-from pythonagent.agent.probes.Instrumentation import module_version_resolver
 import hashlib
 import inspect
 
@@ -47,7 +46,7 @@ def regex_match(list_of_regex, expression):
         return 0
 
 
-def cls_mett_find(node, package_and_module, f, method_filter_list, class_filter_list, jar_field=''):
+def cls_mett_find(node, package_and_module, f, method_filter_list, class_filter_list):
     outfromad = ""
     num_of_methods = 0
 
@@ -94,10 +93,7 @@ def cls_mett_find(node, package_and_module, f, method_filter_list, class_filter_
     joined_string = ",".join(lif)
 
     if len(joined_string)>0:
-        # 4th field after methods is the jar-name-equivalent field (mirrors the NodeJS/Java sibling
-        # agents' module|methods|interface|jar layout): "<pkgName>@<pkgVersion>", suffixed "(app)"
-        # when the file belongs to the monitored application itself, or blank if unresolved.
-        outfromad = package_and_module + "||" + joined_string + "|" + jar_field + "\n"
+        outfromad = package_and_module + "||" + joined_string + "\n"
         """
         if pkgname:
             #print("if pkgname")
@@ -144,7 +140,7 @@ def cls_mett_find(node, package_and_module, f, method_filter_list, class_filter_
             #if "flask" in pkgname:
             #    print("joined_stringf", joined_stringf)
             if len(joined_stringf)>0:
-                outfromad += package_and_module + "|" + class_.name + "|" + joined_stringf + "|" + jar_field + "\n"
+                outfromad += package_and_module + "|" + class_.name + "|" + joined_stringf + "\n"
 
                 """
                 if pkgname:
@@ -212,15 +208,9 @@ def find(method_filter_list, class_filter_list):
         if node is None:
             continue
 
-        try:
-            pkg_info = module_version_resolver.resolve(path)
-            jar_field = module_version_resolver.format_jar_field(pkg_info)
-        except Exception as e:
-            jar_field = ''
-
         try:
             outputfromaf, methodscount = cls_mett_find(node, package_and_module, f, method_filter_list,
-                                                       class_filter_list, jar_field)
+                                                       class_filter_list)
         except Exception as e:
             print(e)
         

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/base.py

@@ -151,7 +151,8 @@ class ExitCallInterceptor(BaseInterceptor):
         backend_name = backend_name or http_host
         with self.log_exceptions():
             self.agent.logger.debug("http call begin bt {} http_host {} url {} method_name {} current_time {}".format(bt, http_host, url, method_name, start_time))
-            exit_call= self.agent.http_call_begin(bt, http_host, url, method_name, start_time) # Native
+            if bt:
+                exit_call= self.agent.http_call_begin(bt, http_host, url, method_name, start_time) # Native
         try:
             from pythonagent.agent.probes.havoc.havoc_manager import NDHavocException
             backend_name_value = self.agent.setting_backend_name_otel(backend_name, "HTTP")
@@ -167,8 +168,9 @@ class ExitCallInterceptor(BaseInterceptor):
                 self.agent.logger.info("Havoc Exception {}".format(e))
                 status = 503
                 self.agent.set_current_status_code(503)
-                self.agent.get_nd_header(bt, backend_name, callout_id)
-                self.agent.http_call_end(bt, exit_call, method_name, backend_name, status, 0, start_time, callout_id)
+                if bt:
+                    self.agent.get_nd_header(bt, backend_name, callout_id)
+                    self.agent.http_call_end(bt, exit_call, method_name, backend_name, status, 0, start_time, callout_id)
                 raise e
             else:
                 self.agent.logger.info("Non-Havoc Exception {}".format(e))
@@ -201,7 +203,7 @@ class ExitCallInterceptor(BaseInterceptor):
 
         
         with self.log_exceptions():
-            if not exit_call:
+            if bt and not exit_call:
                 self.agent.logger.debug("http call end bt {} exit_call {} method_name {} backend_name {} status {} duration {} start_time {}".format(bt, exit_call, method_name, backend_name, status, duration, start_time))
                 self.agent.http_call_end(bt, exit_call, method_name, backend_name, status, duration, start_time, callout_id)
 
@@ -218,7 +220,8 @@ class ExitCallInterceptor(BaseInterceptor):
         with self.log_exceptions():
             if not method_name:
                 method_name = ctx.entry_point_fqm if ctx else None
-            ip_handle = self.agent.db_call_begin(method_name, bt, db_host, db_query, query_parameters, db_start_time)
+            if bt:
+                ip_handle = self.agent.db_call_begin(method_name, bt, db_host, db_query, query_parameters, db_start_time)
         try:
 
             from pythonagent.agent.probes.havoc.havoc_manager import NDHavocException
@@ -241,7 +244,8 @@ class ExitCallInterceptor(BaseInterceptor):
                 self.agent.set_current_status_code(status_code)
                 if ctx:
                     ctx.status_code = status_code
-                self.agent.db_call_end(bt, ip_handle, 0, db_start_time, method_name, host_str, status_code)
+                if bt:
+                    self.agent.db_call_end(bt, ip_handle, 0, db_start_time, method_name, host_str, status_code)
                 raise e
             else:
                 self.agent.logger.info("Non-Havoc Exception {}".format(e))

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/frameworks/aiohttp_web.py

@@ -62,9 +62,9 @@ class AIOHTTPWebInterceptor(BaseInterceptor):
 
             bt = self.agent.start_business_transaction(bt_name, correlation_header, nd_cookie_value,
                                                        nv_cookie_value, bt_header_value, fp_instance)
-            print("bt", bt)
 
-            self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
+            if bt:
+                self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
 
         except Exception as e:
             self.agent.logger.exception("Exception in Start BT for AIOHTTP Web {}".format(e))
@@ -81,7 +81,8 @@ class AIOHTTPWebInterceptor(BaseInterceptor):
                 cpu_time_after = get_current_thread_time_in_us()
                 cpu_time = cpu_time_after - (cpu_time_before or 0)
                 self.agent.set_current_status_code(503)
-                self.agent.end_business_transaction(bt, cpu_time)
+                if bt:
+                    self.agent.end_business_transaction(bt, cpu_time)
                 self.agent.havoc_monitor.refresh_configs(self.agent)
                 raise e
             else:
@@ -104,7 +105,8 @@ class AIOHTTPWebInterceptor(BaseInterceptor):
                 if self.agent.header_in_response:
                     x_cav_nv = get_true_false(self.agent.header_in_response)
 
-                nd_cookie_value = self.agent.sdk_getNDSessionCookie(bt).decode()
+                nd_cookie_value_raw = self.agent.sdk_getNDSessionCookie(bt)
+                nd_cookie_value = nd_cookie_value_raw.decode() if nd_cookie_value_raw else None
 
                 if nd_cookie_key:                                         # CavNV Enabled
                     if nd_cookie_value:

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/frameworks/asgi.py

@@ -81,7 +81,8 @@ class ASGIInterceptor(EntryPointInterceptor):
             except Exception as e:
                 self.agent.logger.debug("Could not build entry_point_fqm: {}".format(e))
 
-            self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
+            if bt:
+                self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
 
         except Exception as e:
             self.agent.logger.exception("Exception in Start BT for ASGI {}".format(e))
@@ -98,7 +99,8 @@ class ASGIInterceptor(EntryPointInterceptor):
                 cpu_time_after = get_current_thread_time_in_us()
                 cpu_time = cpu_time_after - (cpu_time_before or 0)
                 self.agent.set_current_status_code(503)
-                self.agent.end_business_transaction(bt, cpu_time)
+                if bt:
+                    self.agent.end_business_transaction(bt, cpu_time)
                 self.agent.havoc_monitor.refresh_configs(self.agent)
                 raise e
             else:
@@ -143,7 +145,7 @@ class ASGIInterceptor(EntryPointInterceptor):
             # when multiple async requests share one OS thread.
             bt = other_info.get("bt")
 
-            if send_event_dict.get('type') == 'http.response.start':
+            if bt and send_event_dict.get('type') == 'http.response.start':
                 status = send_event_dict.get('status', 200)
 
                 # Inject session cookies before forwarding the response start event

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/frameworks/tornado_async_web.py

@@ -39,7 +39,8 @@ class Tornado_async_RequestHandlerInterceptor(EntryPointInterceptor):
             correlation_header = ""
             cpu_time_before = get_current_thread_time_in_us()
             bt = self.start_business_transaction(bt_name, correlation_header, nd_cookie_value, nv_cookie_value, bt_header_value, fp_instance)
-            self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
+            if bt:
+                self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
             self.agent.logger.debug("Modulename: Tornado_async_RequestHandlerInterceptor class || bt value is :{0}".format(bt))
         except Exception as e:
             self.agent.logger.exception("Error in Tornado_async_RequestHandlerInterceptor class start business transaction", e)
@@ -59,7 +60,8 @@ class Tornado_async_RequestHandlerInterceptor(EntryPointInterceptor):
                     x_cav_nv = get_true_false(self.agent.header_in_response)
 
                 result_headers = handler._headers
-                nd_cookie_value = self.agent.sdk_getNDSessionCookie(bt).decode()
+                nd_cookie_value_raw = self.agent.sdk_getNDSessionCookie(bt)
+                nd_cookie_value = nd_cookie_value_raw.decode() if nd_cookie_value_raw else None
                 if nd_cookie_key:  # CavNV Enabled
                     if nd_cookie_value:
                         nd_cookie_str = "{}={}".format(nd_cookie_key, nd_cookie_value)

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/frameworks/wsgi.py

@@ -99,7 +99,8 @@ class WSGIInterceptor(EntryPointInterceptor):
         except Exception as e:
             self.agent.logger.debug("Could not build entry_point_fqm: {}".format(e))
 
-        self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
+        if bt:
+            self.agent.http_req_resp_wrapper(bt, req_headers, "req", 200)
 
         # Invoking inbound havoc failure at the entry of the instrumented method
         # so that the transaction fails at the start and does not continue
@@ -113,7 +114,8 @@ class WSGIInterceptor(EntryPointInterceptor):
                 self.agent.set_current_status_code(503)
                 cpu_time_after = get_current_thread_time_in_us()
                 cpu_time = cpu_time_after - cpu_time_before
-                rc = self.agent.end_business_transaction(bt, cpu_time)
+                if bt:
+                    rc = self.agent.end_business_transaction(bt, cpu_time)
                 raise e
             else:
                 self.agent.logger.debug("Non-Havoc Exception {}".format(e))
@@ -147,7 +149,7 @@ class WSGIInterceptor(EntryPointInterceptor):
             duration = get_validated_duration(before_time, after_time, fqmforentry)
             if bt:
                 self.agent.method_exit(bt, fqmforentry, duration, cpu_time, before_time)
-            self.end_business_transaction(bt, cpu_time)
+                self.end_business_transaction(bt, cpu_time)
 
         return response
 

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/grpc/server_interceptor.py

@@ -108,7 +108,8 @@ class NDGrpcServerInterceptor(EntryPointInterceptor, grpc.ServerInterceptor):
                 self._handle_exception(bt)
                 self._finish(bt, cpu_time_before)
                 raise
-            self.handle_http_status_code(bt, get_status_code(), "")
+            if bt:
+                self.handle_http_status_code(bt, get_status_code(), "")
             self._finish(bt, cpu_time_before)
             return response
         return wrapped
@@ -124,6 +125,7 @@ class NDGrpcServerInterceptor(EntryPointInterceptor, grpc.ServerInterceptor):
                 self._handle_exception(bt)
                 self._finish(bt, cpu_time_before)
                 raise
-            self.handle_http_status_code(bt, get_status_code(), "")
+            if bt:
+                self.handle_http_status_code(bt, get_status_code(), "")
             self._finish(bt, cpu_time_before)
         return wrapped

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/http/aiohttp_client.py

@@ -23,14 +23,15 @@ class AsyncioHTTPClientInterceptor(ExitCallInterceptor):
                 host_port = "NA|default_host|default_port|default_url"
 
             mName = _request.__module__ + "." + _request.__qualname__
-            headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
+            if self.bt:
+                headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
 
-            client_session_object = args[0]
+                client_session_object = args[0]
 
-            if client_session_object._default_headers:
-                client_session_object._default_headers["CavNDFPInstance"] = headers_value
-            else:
-                client_session_object._default_headers = {"CavNDFPInstance": headers_value}
+                if client_session_object._default_headers:
+                    client_session_object._default_headers["CavNDFPInstance"] = headers_value
+                else:
+                    client_session_object._default_headers = {"CavNDFPInstance": headers_value}
 
             bt = self.bt
             start_time = get_current_timestamp_in_us()

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/http/httpx_client.py

@@ -28,14 +28,15 @@ class HTTPXAsyncClientInterceptor(ExitCallInterceptor):
 
             bt = self.bt
             mName = send.__module__ + "." + send.__qualname__
-            headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
+            if bt:
+                headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
 
-            client_session_object = args[0]
+                client_session_object = args[0]
 
-            if client_session_object._headers:
-                client_session_object._headers["CavNDFPInstance"] = headers_value
-            else:
-                client_session_object._headers = {"CavNDFPInstance": headers_value}
+                if client_session_object._headers:
+                    client_session_object._headers["CavNDFPInstance"] = headers_value
+                else:
+                    client_session_object._headers = {"CavNDFPInstance": headers_value}
 
 
             start_time = get_current_timestamp_in_us()
@@ -82,12 +83,13 @@ class HTTPXClientInterceptor(ExitCallInterceptor):
             bt = self.bt
             mName = send.__module__ + "." + send.__qualname__
 
-            headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
-            client_session_object = args[0]
-            if client_session_object._headers:
-                client_session_object._headers["CavNDFPInstance"] = headers_value
-            else:
-                client_session_object._headers = {"CavNDFPInstance": headers_value}
+            if bt:
+                headers_value = self.agent.get_nd_header(self.bt, host_port, unique_id).decode()
+                client_session_object = args[0]
+                if client_session_object._headers:
+                    client_session_object._headers["CavNDFPInstance"] = headers_value
+                else:
+                    client_session_object._headers = {"CavNDFPInstance": headers_value}
 
             start_time = get_current_timestamp_in_us()
             exit_call = self.http_call_begin(bt, host_port, url, mName, start_time, host_port, unique_id)

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/langchain/base_tool.py

@@ -86,7 +86,8 @@ class LangChainBaseToolInterceptor(ExitCallInterceptor):
                     self.agent.logger.info("langchain base tool sending tool span {}".format(tool_span_json))
 
                 # SDK API call to send logs to NF
-                self.agent.dump_log_message(bt, tool_span_json)
+                if bt:
+                    self.agent.dump_log_message(bt, tool_span_json)
 
         except Exception as e:
             self.agent.logger.exception("langchain base tool db call begin {}".format(e))

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/langchain/langchain_community.py

@@ -107,7 +107,8 @@ class LangChainCommunityVectorStoreInterceptor(ExitCallInterceptor):
                 # SDK API call to send logs to NF
                 if self.agent.logger.isEnabledFor(logging.INFO):
                      self.agent.logger.info("langchain community vectordb sending vectordb span {}".format(retrieval_span_json))
-                self.agent.dump_log_message(bt, retrieval_span_json)
+                if bt:
+                    self.agent.dump_log_message(bt, retrieval_span_json)
 
         except Exception as e:
             self.agent.logger.exception("Exception in langchain community vectorstore db call end {}".format(e))

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/langchain/langchain_openai.py

@@ -94,7 +94,8 @@ class LangChainOpenAIEmbeddingsInterceptor(ExitCallInterceptor):
                 # SDK API call to send logs to NF
                 if self.agent.logger.isEnabledFor(logging.INFO):
                     self.agent.logger.info("langchain openai embeddings sending embeddings span {}".format(embedding_span_json))
-                self.agent.dump_log_message(bt, embedding_span_json)
+                if bt:
+                    self.agent.dump_log_message(bt, embedding_span_json)
 
         except Exception as e:
             self.agent.logger.exception("langchain openai embeddings db call end {}".format(e))

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/message_brokers/pika.py

@@ -57,14 +57,15 @@ class PikaBlockingChannelInterceptor(BaseInterceptor):
             exit_call = self.agent.db_call_begin(self.bt, host_name_str, db_query, db_query_params, db_start_time)
 
             # Injecting custom headers
-            headers_value = self.agent.get_nd_header(self.bt, host_name_str, generate_callout_id()).decode()
-            properties = kwargs.get('properties', None)
-            if properties:
-                if properties.headers:
-                    properties.headers["CavNDFPInstance"] = headers_value
-                else:
-                    properties.headers = {}
-                    properties.headers["CavNDFPInstance"] = headers_value
+            if self.bt:
+                headers_value = self.agent.get_nd_header(self.bt, host_name_str, generate_callout_id()).decode()
+                properties = kwargs.get('properties', None)
+                if properties:
+                    if properties.headers:
+                        properties.headers["CavNDFPInstance"] = headers_value
+                    else:
+                        properties.headers = {}
+                        properties.headers["CavNDFPInstance"] = headers_value
 
         except Exception as e:
             self.agent.logger.warning("Exception in DB Begin for pika BlockingChannel.basic_publish {}".format(e))

{cavisson_pythonagent-0.0.1 → cavisson_pythonagent-0.0.2}/pythonagent/agent/probes/openai/openai.py

@@ -175,7 +175,8 @@ def _record_llm_span(interceptor, bt, fqm, start_time, duration, context,
     )
     if interceptor.agent.logger.isEnabledFor(logging.INFO):
         interceptor.agent.logger.info("openai llm sending llm span output={}".format(output))
-    interceptor.agent.dump_log_message(bt, llm_span.create_span_json())
+    if bt:
+        interceptor.agent.dump_log_message(bt, llm_span.create_span_json())
 
 
 def _record_call_success(interceptor, bt, exit_call, start_time, fqm, context,
@@ -635,7 +636,8 @@ def _record_embedding_span(interceptor, bt, exit_call, start_time, fqm,
         interceptor.agent.logger.info(
             "openai embeddings sending span output={}".format(output)
         )
-    interceptor.agent.dump_log_message(bt, embedding_span.create_span_json())
+    if bt:
+        interceptor.agent.dump_log_message(bt, embedding_span.create_span_json())
 
 
 class OpenAIEmbeddingsInterceptor(ExitCallInterceptor):