monocle-apptrace 0.4.0b1__tar.gz → 0.4.0b3__tar.gz

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/CHANGELOG.md

@@ -1,3 +1,15 @@
+## Version 0.4.0b3 (2025-05-28)
+
+- Record input and errors for inference.modelapi in case of error ([#193](https://github.com/monocle2ai/monocle/pull/193))
+- Removed special handling for streaming in wrapper ([#192](https://github.com/monocle2ai/monocle/pull/192))
+
+
+## Version 0.4.0b2 (2025-05-21)
+
+- Add Span error handling ([#186](https://github.com/monocle2ai/monocle/pull/186))
+- Add teams ai enhancements ([#184](https://github.com/monocle2ai/monocle/pull/184))
+
+
 ## Version 0.4.0b1 (2025-05-14)
 
 - Added conversation id in scope for teams ai bot ([#180](https://github.com/monocle2ai/monocle/pull/180))

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.4.0b1
+Version: 0.4.0b3
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -16,40 +16,44 @@ Requires-Dist: opentelemetry-sdk>=1.21.0
 Requires-Dist: requests
 Requires-Dist: wrapt>=1.14.0
 Provides-Extra: aws
-Requires-Dist: boto3==1.35.19; extra == 'aws'
+Requires-Dist: boto3==1.37.24; extra == 'aws'
 Provides-Extra: azure
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'azure'
 Provides-Extra: dev
-Requires-Dist: anthropic==0.49.0; extra == 'dev'
+Requires-Dist: anthropic-haystack; extra == 'dev'
+Requires-Dist: anthropic==0.52.0; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
-Requires-Dist: boto3==1.34.131; extra == 'dev'
-Requires-Dist: chromadb==0.4.22; extra == 'dev'
+Requires-Dist: boto3==1.37.24; extra == 'dev'
+Requires-Dist: chromadb==1.0.10; extra == 'dev'
 Requires-Dist: datasets==2.20.0; extra == 'dev'
 Requires-Dist: faiss-cpu==1.8.0; extra == 'dev'
 Requires-Dist: flask; extra == 'dev'
 Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
 Requires-Dist: instructorembedding==1.0.1; extra == 'dev'
-Requires-Dist: langchain-aws==0.1.10; extra == 'dev'
-Requires-Dist: langchain-chroma==0.1.1; extra == 'dev'
-Requires-Dist: langchain-community==0.2.5; extra == 'dev'
-Requires-Dist: langchain-mistralai==0.1.13; extra == 'dev'
-Requires-Dist: langchain-openai==0.1.8; extra == 'dev'
-Requires-Dist: langchain==0.2.5; extra == 'dev'
+Requires-Dist: langchain-anthropic==0.3.13; extra == 'dev'
+Requires-Dist: langchain-aws==0.2.23; extra == 'dev'
+Requires-Dist: langchain-chroma==0.2.4; extra == 'dev'
+Requires-Dist: langchain-community==0.3.24; extra == 'dev'
+Requires-Dist: langchain-mistralai==0.2.10; extra == 'dev'
+Requires-Dist: langchain-openai==0.3.18; extra == 'dev'
+Requires-Dist: langchain==0.3.25; extra == 'dev'
 Requires-Dist: langchainhub==0.1.21; extra == 'dev'
 Requires-Dist: langgraph==0.2.68; extra == 'dev'
-Requires-Dist: llama-index-embeddings-huggingface==0.2.0; extra == 'dev'
-Requires-Dist: llama-index-llms-azure-openai==0.1.9; extra == 'dev'
-Requires-Dist: llama-index-llms-mistralai==0.1.20; extra == 'dev'
-Requires-Dist: llama-index-vector-stores-chroma==0.1.9; extra == 'dev'
-Requires-Dist: llama-index-vector-stores-opensearch==0.1.10; extra == 'dev'
-Requires-Dist: llama-index==0.10.30; extra == 'dev'
+Requires-Dist: llama-index-embeddings-huggingface==0.5.4; extra == 'dev'
+Requires-Dist: llama-index-llms-anthropic==0.6.19; extra == 'dev'
+Requires-Dist: llama-index-llms-azure-openai==0.3.2; extra == 'dev'
+Requires-Dist: llama-index-llms-mistralai==0.4.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-chroma==0.4.1; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-opensearch==0.5.4; extra == 'dev'
+Requires-Dist: llama-index==0.12.37; extra == 'dev'
 Requires-Dist: mistral-haystack==0.0.2; extra == 'dev'
 Requires-Dist: numpy==1.26.4; extra == 'dev'
 Requires-Dist: opendal==0.45.14; extra == 'dev'
 Requires-Dist: opensearch-haystack==1.2.0; extra == 'dev'
 Requires-Dist: opentelemetry-instrumentation-flask; extra == 'dev'
 Requires-Dist: parameterized==0.9.0; extra == 'dev'
-Requires-Dist: pytest==8.0.0; extra == 'dev'
+Requires-Dist: pytest-asyncio==0.26.0; extra == 'dev'
+Requires-Dist: pytest==8.3.5; extra == 'dev'
 Requires-Dist: requests-aws4auth==1.2.3; extra == 'dev'
 Requires-Dist: sentence-transformers==2.6.1; extra == 'dev'
 Requires-Dist: types-requests==2.31.0.20240106; extra == 'dev'

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monocle_apptrace"
-version = "0.4.0b1"
+version = "0.4.0b3"
 authors = []
 description = "package with monocle genAI tracing"
 readme = "README.md"
@@ -41,39 +41,43 @@ markers = [
 
 [project.optional-dependencies]
 dev = [
-  'langchain-openai==0.1.8',
-  'langchain-chroma==0.1.1',
-  'langchain-community==0.2.5',
-  'langchain==0.2.5',
+  'langchain-openai==0.3.18',
+  'langchain-chroma==0.2.4',
+  'langchain-community==0.3.24',
+  'langchain==0.3.25',
   'datasets==2.20.0',
   'numpy==1.26.4',
   'types-requests==2.31.0.20240106',
   'InstructorEmbedding==1.0.1',
   'sentence-transformers==2.6.1',
   'faiss-cpu==1.8.0',
-  'pytest==8.0.0',
-  'llama-index==0.10.30',
-  'llama-index-embeddings-huggingface==0.2.0',
-  'llama-index-vector-stores-chroma==0.1.9',
+  'pytest==8.3.5',
+  'llama-index==0.12.37',
+  'llama-index-embeddings-huggingface==0.5.4',
+  'llama-index-vector-stores-chroma==0.4.1',
   'parameterized==0.9.0',
-  'llama-index-llms-mistralai==0.1.20',
-  'langchain-mistralai==0.1.13',
+  'llama-index-llms-mistralai==0.4.0',
+  'langchain-mistralai==0.2.10',
   'mistral-haystack==0.0.2',
-  'langchain-aws==0.1.10',
+  'langchain-aws==0.2.23',
   'azure-storage-blob==12.22.0', # this is for blob exporter
-  'boto3==1.34.131', # this is for aws exporter
-  'llama-index-vector-stores-opensearch==0.1.10',
+  'boto3==1.37.24', # this is for aws exporter
+  'llama-index-vector-stores-opensearch==0.5.4',
   'haystack-ai==2.3.0',
-  'llama-index-llms-azure-openai==0.1.9',
+  'llama-index-llms-azure-openai==0.3.2',
   'requests-aws4auth==1.2.3',
   'opensearch-haystack==1.2.0',
   'langchainhub==0.1.21',
-  'chromadb==0.4.22',
+  'chromadb==1.0.10',
   'flask',
   'opentelemetry-instrumentation-flask',
   'langgraph==0.2.68',
   'opendal==0.45.14',
-  'anthropic==0.49.0',
+  'anthropic==0.52.0',
+  'anthropic-haystack',
+  'pytest-asyncio==0.26.0',
+  'llama-index-llms-anthropic==0.6.19',
+  'langchain-anthropic==0.3.13'
 ]
 
 azure = [
@@ -81,7 +85,7 @@ azure = [
 ]
 
 aws = [
-    'boto3==1.35.19',
+    'boto3==1.37.24',
 ]
 
 [project.urls]

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/common/constants.py

@@ -14,10 +14,10 @@ GITHUB_CODESPACE_IDENTIFIER_ENV_NAME = "GITHUB_REPOSITORY"
 # Azure naming reference can be found here
 # https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/resource-abbreviations
 # https://docs.aws.amazon.com/resource-explorer/latest/userguide/supported-resource-types.html#services-lookoutmetrics
-AZURE_FUNCTION_NAME = "azure.func"
-AZURE_APP_SERVICE_NAME = "azure.asp"
-AZURE_ML_SERVICE_NAME = "azure.mlw"
-AWS_LAMBDA_SERVICE_NAME = "aws.lambda"
+AZURE_FUNCTION_NAME = "azure_func"
+AZURE_APP_SERVICE_NAME = "azure_webapp"
+AZURE_ML_SERVICE_NAME = "azure_ml"
+AWS_LAMBDA_SERVICE_NAME = "aws_lambda"
 GITHUB_CODESPACE_SERVICE_NAME = "github_codespace"
 
 # Env variables to identify infra service type

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/common/span_handler.py

@@ -42,8 +42,17 @@ class SpanHandler:
     def skip_span(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
         return False
 
-    def skip_processor(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
-        return False
+    def skip_processor(self, to_wrap, wrapped, instance, span, args, kwargs) -> list[str]:
+        return []
+    
+    def set_span_type(self, to_wrap, wrapped, instance, output_processor, span:Span, args, kwargs) -> str:
+        span_type:str = None
+        if 'type' in output_processor:
+            span_type = output_processor['type']
+            span.set_attribute("span.type", span_type)
+        else:
+            logger.warning("type of span not found or incorrect written in entity json")
+        return span_type
 
     def pre_task_processing(self, to_wrap, wrapped, instance, args,kwargs, span):
         if "pipeline" in to_wrap['package']:
@@ -69,30 +78,32 @@ class SpanHandler:
         workflow_name = SpanHandler.get_workflow_name(span=span)
         if workflow_name:
             span.set_attribute("workflow.name", workflow_name)
+        span.set_attribute("span.type", "generic")
 
     def post_task_processing(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span):
-        if span.status.status_code == StatusCode.UNSET:
-            span.set_status(StatusCode.OK)
+        pass
 
-    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span) -> bool:
-        detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span)
-        detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span)
-        if detected_error_in_attribute or detected_error_in_event:
-            span.set_attribute(MONOCLE_DETECTED_SPAN_ERROR, True)
+    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span, parent_span = None, ex:Exception = None) -> bool:
+        try:
+            detected_error_in_attribute = self.hydrate_attributes(to_wrap, wrapped, instance, args, kwargs, result, span)
+            detected_error_in_event = self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, result, span, parent_span, ex)
+            if detected_error_in_attribute or detected_error_in_event:
+                span.set_attribute(MONOCLE_DETECTED_SPAN_ERROR, True)
+        finally:
+            if span.status.status_code == StatusCode.UNSET and ex is None:
+                span.set_status(StatusCode.OK)
 
     def hydrate_attributes(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span) -> bool:
         detected_error:bool = False
         span_index = 0
         if SpanHandler.is_root_span(span):
             span_index = 2 # root span will have workflow and hosting entities pre-populated
-        if not self.skip_processor(to_wrap, wrapped, instance, args, kwargs) and (
-                'output_processor' in to_wrap and to_wrap["output_processor"] is not None):
+        if 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['output_processor']
-            if 'type' in output_processor:
-                span.set_attribute("span.type", output_processor['type'])
-            else:
-                logger.warning("type of span not found or incorrect written in entity json")
-            if 'attributes' in output_processor:
+            self.set_span_type(to_wrap, wrapped, instance, output_processor, span, args, kwargs)
+            skip_processors:list[str] = self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []
+
+            if 'attributes' in output_processor and 'attributes' not in skip_processors:
                 for processors in output_processor["attributes"]:
                     for processor in processors:
                         attribute = processor.get('attribute')
@@ -113,10 +124,6 @@ class SpanHandler:
                         else:
                             logger.debug(f"{' and '.join([key for key in ['attribute', 'accessor'] if not processor.get(key)])} not found or incorrect in entity JSON")
                     span_index += 1
-            else:
-                logger.debug("attributes not found or incorrect written in entity json")
-        else:
-            span.set_attribute("span.type", "generic")
 
         # set scopes as attributes by calling get_scopes()
         # scopes is a Mapping[str:object], iterate directly with .items()
@@ -127,16 +134,21 @@ class SpanHandler:
             span.set_attribute("entity.count", span_index)
         return detected_error
 
-    def hydrate_events(self, to_wrap, wrapped, instance, args, kwargs, ret_result, span) -> bool:
+    def hydrate_events(self, to_wrap, wrapped, instance, args, kwargs, ret_result, span, parent_span=None, ex:Exception=None) -> bool:
         detected_error:bool = False
-        if not self.skip_processor(to_wrap, wrapped, instance, args, kwargs) and (
-                'output_processor' in to_wrap and to_wrap["output_processor"] is not None):
+        if 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['output_processor']
-            arguments = {"instance": instance, "args": args, "kwargs": kwargs, "result": ret_result}
-            if 'events' in output_processor:
+            skip_processors:list[str] = self.skip_processor(to_wrap, wrapped, instance, span, args, kwargs) or []
+
+            arguments = {"instance": instance, "args": args, "kwargs": kwargs, "result": ret_result, "exception":ex}
+            # Process events if they are defined in the output_processor.
+            # In case of inference.modelapi skip the event processing unless the span has an exception
+            if 'events' in output_processor and ('events' not in skip_processors or ex is not None):
                 events = output_processor['events']
                 for event in events:
                     event_name = event.get("name")
+                    if 'events.'+event_name in skip_processors and ex is None:
+                        continue
                     event_attributes = {}
                     attributes = event.get("attributes", [])
                     for attribute in attributes:
@@ -231,7 +243,7 @@ class SpanHandler:
 
     @staticmethod
     @contextmanager
-    def workflow_type(to_wrap=None):
+    def workflow_type(to_wrap=None, span:Span=None):
         token = SpanHandler.attach_workflow_type(to_wrap)
         try:
             yield
@@ -241,6 +253,20 @@ class SpanHandler:
 
 class NonFrameworkSpanHandler(SpanHandler):
 
+    def get_workflow_name_in_progress(self) -> str:
+        return get_value(WORKFLOW_TYPE_KEY)
+
+    def is_framework_span_in_progess(self) -> bool:
+        return self.get_workflow_name_in_progress() in WORKFLOW_TYPE_MAP.values()
+
     # If the language framework is being executed, then skip generating direct openAI attributes and events
-    def skip_processor(self, to_wrap, wrapped, instance, args, kwargs) -> bool:
-        return get_value(WORKFLOW_TYPE_KEY) in WORKFLOW_TYPE_MAP.values()
+    def skip_processor(self, to_wrap, wrapped, instance, span, args, kwargs) -> list[str]:
+        if self.is_framework_span_in_progess():
+            return ["attributes", "events"]
+    
+    def set_span_type(self, to_wrap, wrapped, instance, output_processor, span:Span, args, kwargs) -> str:
+        span_type = super().set_span_type(to_wrap, wrapped, instance, output_processor, span, args, kwargs)
+        if self.is_framework_span_in_progess() and span_type is not None:
+            span_type = span_type+".modelapi"
+            span.set_attribute("span.type", span_type)
+        return span_type

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/common/utils.py

@@ -236,6 +236,13 @@ def set_scopes_from_baggage(baggage_context:Context):
             scope_name = scope_key[len(MONOCLE_SCOPE_NAME_PREFIX):]
             set_scope(scope_name, scope_value)
 
+def get_parent_span() -> Span:
+    parent_span: Span = None
+    _parent_span_context = get_current()
+    if _parent_span_context is not None and _parent_span_context.get(_SPAN_KEY, None):
+        parent_span = _parent_span_context.get(_SPAN_KEY, None)    
+    return parent_span
+
 def extract_http_headers(headers) -> object:
     global http_scopes
     trace_context:Context = extract(headers, context=get_current())
@@ -362,6 +369,27 @@ def get_llm_type(instance):
     except:
         pass
 
+def get_status(arguments):
+    if arguments['exception'] is not None:
+        return 'error'
+    else:
+        return 'success'
+
+def get_exception_status_code(arguments):
+    if arguments['exception'] is not None and hasattr(arguments['exception'], 'code'):
+        return arguments['exception'].code
+    else:
+        return 'error'
+
+def get_exception_message(arguments):
+    if arguments['exception'] is not None:
+        if hasattr(arguments['exception'], 'message'):
+            return arguments['exception'].message
+        else:
+            return arguments['exception'].__str__()
+    else:
+        return ''
+
 def patch_instance_method(obj, method_name, func):
     """
     Patch a special method (like __iter__) for a single instance.

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/common/wrapper.py

@@ -9,7 +9,8 @@ from monocle_apptrace.instrumentation.common.utils import (
     set_scopes,
     with_tracer_wrapper,
     set_scope,
-    remove_scope
+    remove_scope,
+    get_parent_span
 )
 from monocle_apptrace.instrumentation.common.constants import WORKFLOW_TYPE_KEY, ADD_NEW_WORKFLOW
 logger = logging.getLogger(__name__)
@@ -30,12 +31,22 @@ def pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped,
         SpanHandler.set_workflow_properties(span, to_wrap)
     else:
         SpanHandler.set_non_workflow_properties(span)
-        handler.pre_task_processing(to_wrap, wrapped, instance, args, kwargs, span)
+        try:
+            handler.pre_task_processing(to_wrap, wrapped, instance, args, kwargs, span)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_task_processing: {e}")
 
-def post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span):
+def post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, parent_span=None, ex = None):
     if not (SpanHandler.is_root_span(span) or get_value(ADD_NEW_WORKFLOW) == True):
-        handler.hydrate_span(to_wrap, wrapped, instance, args, kwargs, return_value, span)
-        handler.post_task_processing(to_wrap, wrapped, instance, args, kwargs, return_value, span)
+        try:
+            handler.hydrate_span(to_wrap, wrapped, instance, args, kwargs, return_value, span, parent_span, ex)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in hydrate_span: {e}")
+        
+        try:
+            handler.post_task_processing(to_wrap, wrapped, instance, args, kwargs, return_value, span)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_task_processing: {e}")
 
 def get_span_name(to_wrap, instance):
     if to_wrap.get("span_name"):
@@ -49,44 +60,45 @@ def monocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler, to_wrap
     name = get_span_name(to_wrap, instance)
     return_value = None
     span_status = None
-    if(get_auto_close_span(to_wrap, kwargs)):
-        with tracer.start_as_current_span(name) as span:
-            pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped, instance, args, kwargs, span, source_path)
-            
-            if SpanHandler.is_root_span(span) or add_workflow_span:
-                # Recursive call for the actual span
-                return_value, span_status = monocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
-                span.set_status(span_status)
-            else:
-                with SpanHandler.workflow_type(to_wrap):
-                    return_value = wrapped(*args, **kwargs)
-                post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span)
-                span_status = span.status
-    else:
-        span = tracer.start_span(name)
-        
+    auto_close_span = get_auto_close_span(to_wrap, kwargs)
+    parent_span = get_parent_span()
+    with tracer.start_as_current_span(name, end_on_exit=auto_close_span) as span:
         pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped, instance, args, kwargs, span, source_path)
         
-        def post_process_span_internal(ret_val):
-            nonlocal handler, to_wrap, wrapped, instance, args, kwargs, span
-            post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span)
-            span.end()
-                    
-        with SpanHandler.workflow_type(to_wrap):
-            return_value = wrapped(*args, **kwargs)
-        if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
-            # Process the stream
-            to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
-        else: 
-            span.end()
-        span_status = span.status
+        if SpanHandler.is_root_span(span) or add_workflow_span:
+            # Recursive call for the actual span
+            return_value, span_status = monocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
+            span.set_status(span_status)
+            if not auto_close_span:
+                span.end()
+        else:
+            ex:Exception = None
+            try:
+                with SpanHandler.workflow_type(to_wrap, span):
+                    return_value = wrapped(*args, **kwargs)
+            except Exception as e:
+                ex = e
+                raise
+            finally:
+                def post_process_span_internal(ret_val):
+                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span, parent_span ,ex)
+                    if not auto_close_span:
+                        span.end()
+                if ex is None and not auto_close_span and to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
+                    to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
+                else:
+                    post_process_span_internal(return_value)
+            span_status = span.status
     return return_value, span_status
 
 def monocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, args, kwargs):
     return_value = None
     token = None
     try:
-        handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        try:
+            handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_tracing: {e}")
         if to_wrap.get('skip_span', False) or handler.skip_span(to_wrap, wrapped, instance, args, kwargs):
             return_value = wrapped(*args, **kwargs)
         else:
@@ -98,45 +110,44 @@ def monocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, inst
                 detach(token)
         return return_value
     finally:
-        handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
-
+        try:
+            handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_tracing: {e}")
 
 async def amonocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, add_workflow_span, args, kwargs):
     # Main span processing logic
     name = get_span_name(to_wrap, instance)
     return_value = None
     span_status = None
-    if(get_auto_close_span(to_wrap, kwargs)):
-        with tracer.start_as_current_span(name) as span:
-            pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped, instance, args, kwargs, span, source_path)
-            
-            if SpanHandler.is_root_span(span) or add_workflow_span:
-                # Recursive call for the actual span
-                return_value, span_status = await amonocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
-                span.set_status(span_status)
-            else:
-                with SpanHandler.workflow_type(to_wrap):
-                    return_value = await wrapped(*args, **kwargs)
-                span_status = span.status
-            post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span)
-    else:
-        span = tracer.start_span(name)
-        
+    auto_close_span = get_auto_close_span(to_wrap, kwargs)
+    parent_span = get_parent_span()
+    with tracer.start_as_current_span(name, end_on_exit=auto_close_span) as span:
         pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped, instance, args, kwargs, span, source_path)
         
-        def post_process_span_internal(ret_val):
-            nonlocal handler, to_wrap, wrapped, instance, args, kwargs, span
-            post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span)
-            span.end()
-
-        with SpanHandler.workflow_type(to_wrap):
-            return_value = await wrapped(*args, **kwargs)
-           
-        if to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
-            # Process the stream
-            to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
-        else: 
-            span.end()
+        if SpanHandler.is_root_span(span) or add_workflow_span:
+            # Recursive call for the actual span
+            return_value, span_status = await amonocle_wrapper_span_processor(tracer, handler, to_wrap, wrapped, instance, source_path, False, args, kwargs)
+            span.set_status(span_status)
+            if not auto_close_span:
+                span.end()
+        else:
+            ex:Exception = None
+            try:
+                with SpanHandler.workflow_type(to_wrap, span):
+                    return_value = await wrapped(*args, **kwargs)
+            except Exception as e:
+                ex = e
+                raise
+            finally:
+                def post_process_span_internal(ret_val):
+                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, ret_val, span, parent_span,ex)
+                    if not auto_close_span:
+                        span.end()
+                if ex is None and not auto_close_span and to_wrap.get("output_processor") and to_wrap.get("output_processor").get("response_processor"):
+                    to_wrap.get("output_processor").get("response_processor")(to_wrap, return_value, post_process_span_internal)
+                else:
+                    post_process_span_internal(return_value)
         span_status = span.status
     return return_value, span.status
 
@@ -144,7 +155,10 @@ async def amonocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrappe
     return_value = None
     token = None
     try:
-        handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        try:
+            handler.pre_tracing(to_wrap, wrapped, instance, args, kwargs)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in pre_tracing: {e}")
         if to_wrap.get('skip_span', False) or handler.skip_span(to_wrap, wrapped, instance, args, kwargs):
             return_value = await wrapped(*args, **kwargs)
         else:
@@ -156,7 +170,10 @@ async def amonocle_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrappe
                 detach(token)
         return return_value
     finally:
-        handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        try:
+            handler.post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)
+        except Exception as e:
+            logger.info(f"Warning: Error occurred in post_tracing: {e}")
 
 @with_tracer_wrapper
 def task_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, args, kwargs):
@@ -193,7 +210,7 @@ async def ascope_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped,
 @with_tracer_wrapper
 def scopes_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, args, kwargs):
     scope_values = to_wrap.get('scope_values', None)
-    scope_values = evaluate_scope_values(args, kwargs, scope_values)
+    scope_values = evaluate_scope_values(args, kwargs, to_wrap, scope_values)
     token = None
     try:
         if scope_values:
@@ -207,7 +224,7 @@ def scopes_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, insta
 @with_tracer_wrapper
 async def ascopes_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped, instance, source_path, args, kwargs):
     scope_values = to_wrap.get('scope_values', None)
-    scope_values = evaluate_scope_values(args, kwargs, scope_values)
+    scope_values = evaluate_scope_values(args, kwargs, to_wrap, scope_values)
     token = None
     try:
         if scope_values:
@@ -218,7 +235,7 @@ async def ascopes_wrapper(tracer: Tracer, handler: SpanHandler, to_wrap, wrapped
         if token:
             remove_scope(token)
 
-def evaluate_scope_values(args, kwargs, scope_values):
+def evaluate_scope_values(args, kwargs, to_wrap, scope_values):
     if callable(scope_values):
         try:
             scope_values = scope_values(args, kwargs)
@@ -227,5 +244,4 @@ def evaluate_scope_values(args, kwargs, scope_values):
             scope_values = None
     if isinstance(scope_values, dict):
         return scope_values
-    return None
-    
+    return None

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/common/wrapper_method.py

@@ -10,6 +10,7 @@ from monocle_apptrace.instrumentation.metamodel.langchain.methods import (
 from monocle_apptrace.instrumentation.metamodel.llamaindex.methods import (LLAMAINDEX_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.haystack.methods import (HAYSTACK_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.openai.methods import (OPENAI_METHODS,)
+from monocle_apptrace.instrumentation.metamodel.openai._helper import OpenAISpanHandler
 from monocle_apptrace.instrumentation.metamodel.langgraph.methods import LANGGRAPH_METHODS
 from monocle_apptrace.instrumentation.metamodel.flask.methods import (FLASK_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.flask._helper import FlaskSpanHandler, FlaskResponseSpanHandler
@@ -76,5 +77,6 @@ MONOCLE_SPAN_HANDLERS: Dict[str, SpanHandler] = {
     "flask_handler": FlaskSpanHandler(),
     "flask_response_handler": FlaskResponseSpanHandler(),
     "request_handler": RequestSpanHandler(),
-    "non_framework_handler": NonFrameworkSpanHandler()
+    "non_framework_handler": NonFrameworkSpanHandler(),
+    "openai_handler": OpenAISpanHandler(),
 }

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/metamodel/flask/_helper.py

@@ -70,7 +70,7 @@ class FlaskResponseSpanHandler(SpanHandler):
             if _parent_span_context is not None:
                 parent_span: Span = _parent_span_context.get(_SPAN_KEY, None)
                 if parent_span is not None:
-                    self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, return_value, parent_span)
+                    self.hydrate_events(to_wrap, wrapped, instance, args, kwargs, return_value, parent_span=parent_span)
         except Exception as e:
             logger.info(f"Failed to propogate flask response: {e}")
         super().post_tracing(to_wrap, wrapped, instance, args, kwargs, return_value)

{monocle_apptrace-0.4.0b1 → monocle_apptrace-0.4.0b3}/src/monocle_apptrace/instrumentation/metamodel/haystack/_helper.py

@@ -121,7 +121,7 @@ def update_span_from_llm_response(response, instance):
     if response is not None and isinstance(response, dict):
         if "meta" in response:
             token_usage = response["meta"][0]["usage"]
-        if "replies" in response:
+        elif "replies" in response:  # and "meta" in response["replies"][0]:
             token_usage = response["replies"][0].meta["usage"]
         if token_usage is not None:
             temperature = instance.__dict__.get("temperature", None)