monocle-apptrace 0.4.0b2__tar.gz → 0.4.1__tar.gz

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/CHANGELOG.md

@@ -1,11 +1,25 @@
-## Version 0.4.0b2 (2025-05-21)
+## Version 0.4.1 (2025-06-17)
+
+- Add exception status code for Boto3 ([#211](https://github.com/monocle2ai/monocle/pull/211))
+- Add exception status code for anthropic and openai ([#210](https://github.com/monocle2ai/monocle/pull/210))
+- Add prompt template info in teamsAI ([#209](https://github.com/monocle2ai/monocle/pull/209))
+- TeamsAI : added system prompt ([#208](https://github.com/monocle2ai/monocle/pull/208))
+- Add prompt template info in ActionPlanner for teamsAI ([#207](https://github.com/monocle2ai/monocle/pull/207))
+- Add teams channel id as scope in MS teams instrumentations ([#206](https://github.com/monocle2ai/monocle/pull/206))
+- Azure function wrapper to generate http span ([#205](https://github.com/monocle2ai/monocle/pull/205))
+- Azure ai inference sdk ([#204](https://github.com/monocle2ai/monocle/pull/204))
+
+## Version 0.4.0 (2025-06-02)
+
+- Update teams scopes ([#200](https://github.com/monocle2ai/monocle/pull/200))
+- 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))
+
 
 - 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))
 - Update inference entity type of TeamsAI SDK ([#178](https://github.com/monocle2ai/monocle/pull/178))
 - Added stream and async for openai ([#177](https://github.com/monocle2ai/monocle/pull/177))

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.4.0b2
+Version: 0.4.1
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -16,41 +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-haystack; extra == 'dev'
-Requires-Dist: anthropic==0.49.0; 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.0b2 → monocle_apptrace-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monocle_apptrace"
-version = "0.4.0b2"
+version = "0.4.1"
 authors = []
 description = "package with monocle genAI tracing"
 readme = "README.md"
@@ -41,40 +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-haystack'
+  'anthropic==0.52.0',
+  'anthropic-haystack',
+  'pytest-asyncio==0.26.0',
+  'llama-index-llms-anthropic==0.6.19',
+  'langchain-anthropic==0.3.13'
 ]
 
 azure = [
@@ -82,7 +85,7 @@ azure = [
 ]
 
 aws = [
-    'boto3==1.35.19',
+    'boto3==1.37.24',
 ]
 
 [project.urls]

monocle_apptrace-0.4.1/src/monocle_apptrace/instrumentation/__init__.py

@@ -0,0 +1,2 @@
+from .common import *
+from .metamodel.azfunc.wrapper import monocle_trace_azure_function_route

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/common/constants.py

@@ -54,6 +54,9 @@ llm_type_map = {
     "anthropic": "anthropic",
     "chatanthropic":"anthropic",
     "anthropicchatgenerator":"anthropic",
+    "chatcompletionsclient": "azure_ai_inference",
+    "embeddingsclient": "azure_ai_inference",
+    "imageembeddingsclient": "azure_ai_inference",
 }
 
 MONOCLE_INSTRUMENTOR = "monocle_apptrace"

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/common/instrumentor.py

@@ -362,7 +362,7 @@ def monocle_trace_http_route(func):
     if inspect.iscoroutinefunction(func):
         @wraps(func)
         async def wrapper(*args, **kwargs):
-            return http_async_route_handler(func, *args, **kwargs)
+            return await http_async_route_handler(func, *args, **kwargs)
         return wrapper
     else:
         @wraps(func)

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/common/span_handler.py

@@ -83,10 +83,10 @@ class SpanHandler:
     def post_task_processing(self, to_wrap, wrapped, instance, args, kwargs, result, span:Span):
         pass
 
-    def hydrate_span(self, to_wrap, wrapped, instance, args, kwargs, result, span, ex:Exception = None) -> bool:
+    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, ex)
+            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:
@@ -134,18 +134,20 @@ 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, ex:Exception=None) -> 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 'output_processor' in to_wrap and to_wrap["output_processor"] is not None:
             output_processor=to_wrap['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}
-            if 'events' in output_processor and 'events' not in skip_processors:
+            # 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:
+                    if 'events.'+event_name in skip_processors and ex is None:
                         continue
                     event_attributes = {}
                     attributes = event.get("attributes", [])
@@ -157,7 +159,7 @@ class SpanHandler:
                                 result = accessor(arguments)
                                 if result and isinstance(result, dict):
                                     result = dict((key, value) for key, value in result.items() if value is not None)
-                                if result and isinstance(result, (str, list, dict)):
+                                if result and isinstance(result, (int, str, list, dict)):
                                     if attribute_key is not None:
                                         event_attributes[attribute_key] = result
                                     else:

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/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,11 +369,19 @@ 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'):
+    if arguments['exception'] is not None and hasattr(arguments['exception'], 'code') and arguments['exception'].code is not None:
         return arguments['exception'].code
-    else:
+    elif arguments['exception'] is not None:
         return 'error'
+    else:
+        return 'success'
 
 def get_exception_message(arguments):
     if arguments['exception'] is not None:
@@ -377,6 +392,22 @@ def get_exception_message(arguments):
     else:
         return ''
 
+def get_status_code(arguments):
+    if arguments["exception"] is not None:
+        return get_exception_status_code(arguments)
+    elif hasattr(arguments["result"], "status"):
+        return arguments["result"].status
+    else:
+        return 'success'
+
+def get_status(arguments):
+    if arguments["exception"] is not None:
+        return 'error'
+    elif get_status_code(arguments) == 'success':
+        return 'success'
+    else:
+        return 'error'
+
 def patch_instance_method(obj, method_name, func):
     """
     Patch a special method (like __iter__) for a single instance.

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/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__)
@@ -35,10 +36,10 @@ def pre_process_span(name, tracer, handler, add_workflow_span, to_wrap, wrapped,
         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, ex = None):
+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):
         try:
-            handler.hydrate_span(to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
+            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}")
         
@@ -59,45 +60,35 @@ 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:
-                ex:Exception = None
-                try:
-                    with SpanHandler.workflow_type(to_wrap, span):
-                        return_value = wrapped(*args, **kwargs)
-                except Exception as e:
-                    ex = e
-                    raise
-                finally:
-                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
-                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()
-                    
-        try:
-            with SpanHandler.workflow_type(to_wrap, span):
-                return_value = wrapped(*args, **kwargs)
-        finally:
-            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: 
+        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()
-        span_status = span.status
+        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):
@@ -129,44 +120,34 @@ async def amonocle_wrapper_span_processor(tracer: Tracer, handler: SpanHandler,
     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:
-                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:
-                    post_process_span(handler, to_wrap, wrapped, instance, args, kwargs, return_value, span, ex)
-                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()
-
-        try:
-            with SpanHandler.workflow_type(to_wrap, span):
-                return_value = await wrapped(*args, **kwargs)
-        finally:
-            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: 
+        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
 
@@ -229,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:
@@ -243,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:
@@ -254,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)
@@ -263,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.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/common/wrapper_method.py

@@ -2,6 +2,7 @@
 from typing import Any, Dict
 from monocle_apptrace.instrumentation.common.wrapper import task_wrapper, scope_wrapper
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler, NonFrameworkSpanHandler
+from monocle_apptrace.instrumentation.metamodel.azureaiinference.methods import AZURE_AI_INFERENCE_METHODS
 from monocle_apptrace.instrumentation.metamodel.botocore.methods import BOTOCORE_METHODS
 from monocle_apptrace.instrumentation.metamodel.botocore.handlers.botocore_span_handler import BotoCoreSpanHandler
 from monocle_apptrace.instrumentation.metamodel.langchain.methods import (
@@ -20,6 +21,8 @@ from monocle_apptrace.instrumentation.metamodel.teamsai.methods import (TEAMAI_M
 from monocle_apptrace.instrumentation.metamodel.anthropic.methods import (ANTHROPIC_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.aiohttp.methods import (AIOHTTP_METHODS, )
 from monocle_apptrace.instrumentation.metamodel.aiohttp._helper import aiohttpSpanHandler
+from monocle_apptrace.instrumentation.metamodel.azfunc._helper import (azureSpanHandler)
+from monocle_apptrace.instrumentation.metamodel.azfunc.methods import AZFUNC_HTTP_METHODS
 class WrapperMethod:
     def __init__(
             self,
@@ -68,7 +71,7 @@ class WrapperMethod:
     def get_span_handler(self) -> SpanHandler:
         return self.span_handler()
 
-DEFAULT_METHODS_LIST = LANGCHAIN_METHODS + LLAMAINDEX_METHODS + HAYSTACK_METHODS + BOTOCORE_METHODS + FLASK_METHODS + REQUESTS_METHODS + LANGGRAPH_METHODS + OPENAI_METHODS + TEAMAI_METHODS + ANTHROPIC_METHODS + AIOHTTP_METHODS
+DEFAULT_METHODS_LIST = LANGCHAIN_METHODS + LLAMAINDEX_METHODS + HAYSTACK_METHODS + BOTOCORE_METHODS + FLASK_METHODS + REQUESTS_METHODS + LANGGRAPH_METHODS + OPENAI_METHODS + TEAMAI_METHODS + ANTHROPIC_METHODS + AIOHTTP_METHODS + AZURE_AI_INFERENCE_METHODS + AZFUNC_HTTP_METHODS
 
 MONOCLE_SPAN_HANDLERS: Dict[str, SpanHandler] = {
     "default": SpanHandler(),
@@ -79,4 +82,5 @@ MONOCLE_SPAN_HANDLERS: Dict[str, SpanHandler] = {
     "request_handler": RequestSpanHandler(),
     "non_framework_handler": NonFrameworkSpanHandler(),
     "openai_handler": OpenAISpanHandler(),
+    "azure_func_handler": azureSpanHandler(),
 }

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/metamodel/anthropic/_helper.py

@@ -9,6 +9,7 @@ from monocle_apptrace.instrumentation.common.utils import (
     get_keys_as_tuple,
     get_nested_value,
     try_option,
+    get_exception_message,
 )
 
 
@@ -39,12 +40,36 @@ def extract_messages(kwargs):
         logger.warning("Warning: Error occurred in extract_messages: %s", str(e))
         return []
 
+def get_exception_status_code(arguments):
+    if arguments['exception'] is not None and hasattr(arguments['exception'], 'status_code') and arguments['exception'].status_code is not None:
+        return arguments['exception'].status_code
+    elif arguments['exception'] is not None:
+        return 'error'
+    else:
+        return 'success'
 
-def extract_assistant_message(response):
+def get_status_code(arguments):
+    if arguments["exception"] is not None:
+        return get_exception_status_code(arguments)
+    elif hasattr(arguments["result"], "status"):
+        return arguments["result"].status
+    else:
+        return 'success'
+
+def extract_assistant_message(arguments):
     try:
-        if response is not None and hasattr(response,"content") and len(response.content) >0:
-            if hasattr(response.content[0],"text"):
-                return response.content[0].text
+        status = get_status_code(arguments)
+        response: str = ""
+        if status == 'success':
+            if arguments['result'] is not None and hasattr(arguments['result'],"content") and len(arguments['result'].content) >0:
+                if hasattr(arguments['result'].content[0],"text"):
+                    response = arguments['result'].content[0].text
+        else:
+            if arguments["exception"] is not None:
+                response = get_exception_message(arguments)
+            elif hasattr(arguments["result"], "error"):
+                response = arguments["result"].error
+        return response
     except (IndexError, AttributeError) as e:
         logger.warning("Warning: Error occurred in extract_assistant_message: %s", str(e))
         return None

{monocle_apptrace-0.4.0b2 → monocle_apptrace-0.4.1}/src/monocle_apptrace/instrumentation/metamodel/anthropic/entities/inference.py

@@ -1,7 +1,9 @@
 from monocle_apptrace.instrumentation.metamodel.anthropic import (
     _helper,
 )
-from monocle_apptrace.instrumentation.common.utils import resolve_from_alias, get_llm_type
+from monocle_apptrace.instrumentation.common.utils import (resolve_from_alias, get_llm_type,
+    get_status, get_status_code
+)
 
 INFERENCE = {
     "type": "inference",
@@ -52,10 +54,18 @@ INFERENCE = {
         {
             "name": "data.output",
             "attributes": [
+                {
+                    "attribute": "status",
+                    "accessor": lambda arguments: get_status(arguments)
+                },
+                {
+                    "attribute": "status_code",
+                    "accessor": lambda arguments: _helper.get_status_code(arguments)
+                },
                 {
                     "_comment": "this is result from LLM",
                     "attribute": "response",
-                    "accessor": lambda arguments: _helper.extract_assistant_message(arguments['result'])
+                    "accessor": lambda arguments: _helper.extract_assistant_message(arguments)
                 }
             ]
         },