monocle-apptrace 0.4.2__tar.gz → 0.5.0__tar.gz

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/CHANGELOG.md

@@ -1,4 +1,26 @@
 
+## Version 0.5.0 (2025-08-05)
+
+- Fix missing inference span in google ADK ([#249](https://github.com/monocle2ai/monocle/pull/249))
+- Added openai agents instrumentation ([#248](https://github.com/monocle2ai/monocle/pull/248))
+- Google Agent development kit meta mode ([#247](https://github.com/monocle2ai/monocle/pull/247))
+- Add Support for LiteLLM OpenAI and AzureOpenAI ([#246](https://github.com/monocle2ai/monocle/pull/246))
+- Added inference subtype for langgrap, openai and anthropic ([#245](https://github.com/monocle2ai/monocle/pull/245))
+- Add support for teams finish type, move finish types to metadata section ([#240](https://github.com/monocle2ai/monocle/pull/240))
+- Fix integration tests ([#239](https://github.com/monocle2ai/monocle/pull/239))
+- Add function_name attribute for Azure function ([#238](https://github.com/monocle2ai/monocle/pull/238))
+- Added MCP and A2A ([#237](https://github.com/monocle2ai/monocle/pull/237))
+- Add Metamodel for Lambda Func ([#236](https://github.com/monocle2ai/monocle/pull/236))
+- Allow llm SDKs as workflow types ([#234](https://github.com/monocle2ai/monocle/pull/234))
+- Add Sample Span for VertexAI ([#233](https://github.com/monocle2ai/monocle/pull/233))
+- Add Haystack Gemini sample ([#232](https://github.com/monocle2ai/monocle/pull/232))
+- Add Llama Index Gemini sample ([#231](https://github.com/monocle2ai/monocle/pull/231))
+- Add workflow span name to all spans ([#230](https://github.com/monocle2ai/monocle/pull/230))
+- Add Langchain Gemini sample ([#229](https://github.com/monocle2ai/monocle/pull/229))
+- Add Embeddings Span in Gemini Metamodel ([#228](https://github.com/monocle2ai/monocle/pull/228))
+- Agent metamodel updates for LangGraph ([#227](https://github.com/monocle2ai/monocle/pull/227))
+- Add fastapi metamodel with fastapi tracid propogation testcase ([#226](https://github.com/monocle2ai/monocle/pull/226))
+
 ## Version 0.4.2 (2025-06-26)
 
 - Add gemini instrumentation ([#220](https://github.com/monocle2ai/monocle/pull/220))
@@ -122,3 +144,19 @@
 ## 0.0.1 (Jul 17, 2024)
 
 - First monocle release
+
+- Add support for teams finish type, move finish types to metadata section ([#240](https://github.com/monocle2ai/monocle/pull/240))
+- Fix integration tests ([#239](https://github.com/monocle2ai/monocle/pull/239))
+- Add function_name attribute for Azure function ([#238](https://github.com/monocle2ai/monocle/pull/238))
+- Added MCP and A2A ([#237](https://github.com/monocle2ai/monocle/pull/237))
+- Add Metamodel for Lambda Func ([#236](https://github.com/monocle2ai/monocle/pull/236))
+- Allow llm SDKs as workflow types ([#234](https://github.com/monocle2ai/monocle/pull/234))
+- Add Sample Span for VertexAI ([#233](https://github.com/monocle2ai/monocle/pull/233))
+- Add Haystack Gemini sample ([#232](https://github.com/monocle2ai/monocle/pull/232))
+- Add Llama Index Gemini sample ([#231](https://github.com/monocle2ai/monocle/pull/231))
+- Add workflow span name to all spans ([#230](https://github.com/monocle2ai/monocle/pull/230))
+- Add Langchain Gemini sample ([#229](https://github.com/monocle2ai/monocle/pull/229))
+- Add Embeddings Span in Gemini Metamodel ([#228](https://github.com/monocle2ai/monocle/pull/228))
+- Agent metamodel updates for LangGraph ([#227](https://github.com/monocle2ai/monocle/pull/227))
+- Add fastapi metamodel with fastapi tracid propogation testcase ([#226](https://github.com/monocle2ai/monocle/pull/226))
+

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.4.2
+Version: 0.5.0
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -20,43 +20,59 @@ 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: a2a-sdk==0.2.8; extra == 'dev'
 Requires-Dist: anthropic-haystack; extra == 'dev'
-Requires-Dist: anthropic==0.52.0; extra == 'dev'
+Requires-Dist: anthropic==0.57.1; extra == 'dev'
 Requires-Dist: azure-storage-blob==12.22.0; extra == 'dev'
 Requires-Dist: boto3==1.37.24; extra == 'dev'
-Requires-Dist: chromadb==1.0.10; extra == 'dev'
+Requires-Dist: chromadb==1.0.15; extra == 'dev'
+Requires-Dist: click==8.2.1; extra == 'dev'
 Requires-Dist: datasets==2.20.0; extra == 'dev'
 Requires-Dist: faiss-cpu==1.8.0; extra == 'dev'
+Requires-Dist: fastapi>=0.115.0; extra == 'dev'
 Requires-Dist: flask; extra == 'dev'
+Requires-Dist: google-adk==1.10.0; extra == 'dev'
+Requires-Dist: google-generativeai==0.8.5; extra == 'dev'
 Requires-Dist: haystack-ai==2.3.0; extra == 'dev'
+Requires-Dist: httpx==0.28.1; extra == 'dev'
 Requires-Dist: instructorembedding==1.0.1; 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-google-genai==2.1.8; extra == 'dev'
+Requires-Dist: langchain-mcp-adapters==0.1.8; 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.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: langgraph-supervisor==0.0.28; extra == 'dev'
+Requires-Dist: langgraph==0.5.4; extra == 'dev'
+Requires-Dist: llama-index-embeddings-huggingface==0.6.0; extra == 'dev'
+Requires-Dist: llama-index-llms-anthropic==0.8.1; extra == 'dev'
+Requires-Dist: llama-index-llms-azure-openai==0.4.0; extra == 'dev'
+Requires-Dist: llama-index-llms-mistralai==0.7.0; extra == 'dev'
+Requires-Dist: llama-index-llms-openai==0.5.0; extra == 'dev'
+Requires-Dist: llama-index-tools-mcp==0.3.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-chroma==0.5.0; extra == 'dev'
+Requires-Dist: llama-index-vector-stores-opensearch==0.6.0; extra == 'dev'
+Requires-Dist: llama-index==0.13.0; extra == 'dev'
+Requires-Dist: mcp==1.12.1; extra == 'dev'
 Requires-Dist: mistral-haystack==0.0.2; extra == 'dev'
 Requires-Dist: numpy==1.26.4; extra == 'dev'
+Requires-Dist: openai-agents==0.2.6; 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: pydantic==2.11.7; extra == 'dev'
 Requires-Dist: pytest-asyncio==0.26.0; extra == 'dev'
 Requires-Dist: pytest==8.3.5; extra == 'dev'
+Requires-Dist: python-dotenv>=1.1.0; 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'
+Requires-Dist: uvicorn==0.35.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # Monocle for tracing GenAI app code

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monocle_apptrace"
-version = "0.4.2"
+version = "0.5.0"
 authors = []
 description = "package with monocle genAI tracing"
 readme = "README.md"
@@ -52,32 +52,48 @@ dev = [
   'sentence-transformers==2.6.1',
   'faiss-cpu==1.8.0',
   'pytest==8.3.5',
-  'llama-index==0.12.37',
-  'llama-index-embeddings-huggingface==0.5.4',
-  'llama-index-vector-stores-chroma==0.4.1',
+  'llama-index==0.13.0',
+  'llama-index-llms-openai==0.5.0',
+  'llama-index-tools-mcp==0.3.0',
+  'llama-index-embeddings-huggingface==0.6.0',
+  'llama-index-vector-stores-chroma==0.5.0',
   'parameterized==0.9.0',
-  'llama-index-llms-mistralai==0.4.0',
+  'llama-index-llms-mistralai==0.7.0',
   'langchain-mistralai==0.2.10',
   'mistral-haystack==0.0.2',
   'langchain-aws==0.2.23',
   'azure-storage-blob==12.22.0', # this is for blob exporter
   'boto3==1.37.24', # this is for aws exporter
-  'llama-index-vector-stores-opensearch==0.5.4',
+  'llama-index-vector-stores-opensearch==0.6.0',
   'haystack-ai==2.3.0',
-  'llama-index-llms-azure-openai==0.3.2',
+  'llama-index-llms-azure-openai==0.4.0',
   'requests-aws4auth==1.2.3',
   'opensearch-haystack==1.2.0',
   'langchainhub==0.1.21',
-  'chromadb==1.0.10',
+  'chromadb==1.0.15',
   'flask',
   'opentelemetry-instrumentation-flask',
-  'langgraph==0.2.68',
+  'langgraph==0.5.4',
+  'langgraph-supervisor==0.0.28',
   'opendal==0.45.14',
-  'anthropic==0.52.0',
+  'anthropic==0.57.1',
   'anthropic-haystack',
   'pytest-asyncio==0.26.0',
-  'llama-index-llms-anthropic==0.6.19',
-  'langchain-anthropic==0.3.13'
+  'llama-index-llms-anthropic==0.8.1',
+  'langchain-anthropic==0.3.13',
+  'langchain-mcp-adapters==0.1.8',
+  'mcp==1.12.1',
+  'a2a-sdk==0.2.8', 
+  'httpx==0.28.1',
+  'fastapi>=0.115.0',
+  'pydantic==2.11.7',
+  'uvicorn==0.35.0',
+  'click==8.2.1',
+  'python-dotenv>=1.1.0',
+  'langchain-google-genai==2.1.8',
+  'google-adk==1.10.0',
+  'google-generativeai==0.8.5',
+  'openai-agents==0.2.6'
 ]
 
 azure = [

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/src/monocle_apptrace/__main__.py

@@ -1,6 +1,6 @@
 import sys, os
 import runpy
-from monocle_apptrace.instrumentation.common.instrumentor import setup_monocle_telemetry
+from monocle_apptrace import setup_monocle_telemetry
 
 def main():
     if len(sys.argv) < 2 or not sys.argv[1].endswith(".py"):

monocle_apptrace-0.5.0/src/monocle_apptrace/exporters/file_exporter.py

@@ -0,0 +1,182 @@
+#pylint: disable=consider-using-with
+
+from os import linesep, path
+from io import TextIOWrapper
+from datetime import datetime
+import os
+from typing import Optional, Callable, Sequence, Dict, Tuple
+from opentelemetry.sdk.trace import ReadableSpan
+from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
+from opentelemetry.sdk.resources import SERVICE_NAME
+from monocle_apptrace.exporters.base_exporter import SpanExporterBase
+from monocle_apptrace.exporters.exporter_processor import ExportTaskProcessor
+
+DEFAULT_FILE_PREFIX:str = "monocle_trace_"
+DEFAULT_TIME_FORMAT:str = "%Y-%m-%d_%H.%M.%S"
+HANDLE_TIMEOUT_SECONDS: int = 60  # 1 minute timeout
+
+class FileSpanExporter(SpanExporterBase):
+    def __init__(
+        self,
+        service_name: Optional[str] = None,
+        out_path:str = ".",
+        file_prefix = DEFAULT_FILE_PREFIX,
+        time_format = DEFAULT_TIME_FORMAT,
+        formatter: Callable[
+            [ReadableSpan], str
+        ] = lambda span: span.to_json()
+        + linesep,
+        task_processor: Optional[ExportTaskProcessor] = None
+    ):
+        super().__init__()
+        # Dictionary to store file handles: {trace_id: (file_handle, file_path, creation_time, first_span)}
+        self.file_handles: Dict[int, Tuple[TextIOWrapper, str, datetime, bool]] = {}
+        self.formatter = formatter
+        self.service_name = service_name
+        self.output_path = os.getenv("MONOCLE_TRACE_OUTPUT_PATH", out_path)
+        self.file_prefix = file_prefix
+        self.time_format = time_format
+        self.task_processor = task_processor
+        self.is_first_span_in_file = True  # Track if this is the first span in the current file
+        if self.task_processor is not None:
+            self.task_processor.start()
+
+    def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
+        is_root_span = any(not span.parent for span in spans)
+        if self.task_processor is not None and callable(getattr(self.task_processor, 'queue_task', None)):
+            # Check if any span is a root span (no parent)
+            self.task_processor.queue_task(self._process_spans, spans, is_root_span)
+            return SpanExportResult.SUCCESS
+        else:
+            return self._process_spans(spans, is_root_span=is_root_span)
+
+    def _cleanup_expired_handles(self) -> None:
+        """Close and remove file handles that have exceeded the timeout."""
+        current_time = datetime.now()
+        expired_trace_ids = []
+        
+        for trace_id, (handle, file_path, creation_time, _) in self.file_handles.items():
+            if (current_time - creation_time).total_seconds() > HANDLE_TIMEOUT_SECONDS:
+                expired_trace_ids.append(trace_id)
+        
+        for trace_id in expired_trace_ids:
+            self._close_trace_handle(trace_id)
+
+    def _get_or_create_handle(self, trace_id: int, service_name: str) -> Tuple[TextIOWrapper, str, bool]:
+        """Get existing handle or create new one for the trace_id."""
+        self._cleanup_expired_handles()
+        
+        if trace_id in self.file_handles:
+            handle, file_path, creation_time, first_span = self.file_handles[trace_id]
+            return handle, file_path, first_span
+        
+        # Create new handle
+        file_path = path.join(self.output_path,
+                             self.file_prefix + service_name + "_" + hex(trace_id) + "_"
+                             + datetime.now().strftime(self.time_format) + ".json")
+        
+        try:
+            handle = open(file_path, "w", encoding='UTF-8')
+            handle.write("[")
+            self.file_handles[trace_id] = (handle, file_path, datetime.now(), True)
+            return handle, file_path, True
+        except Exception as e:
+            print(f"Error creating file {file_path}: {e}")
+            return None, file_path, True
+
+    def _close_trace_handle(self, trace_id: int) -> None:
+        """Close and remove a specific trace handle."""
+        if trace_id in self.file_handles:
+            handle, file_path, creation_time, _ = self.file_handles[trace_id]
+            try:
+                if handle is not None:
+                    handle.write("]")
+                    handle.close()
+            except Exception as e:
+                print(f"Error closing file {file_path}: {e}")
+            finally:
+                del self.file_handles[trace_id]
+
+    def _mark_span_written(self, trace_id: int) -> None:
+        """Mark that a span has been written for this trace (no longer first span)."""
+        if trace_id in self.file_handles:
+            handle, file_path, creation_time, _ = self.file_handles[trace_id]
+            self.file_handles[trace_id] = (handle, file_path, creation_time, False)
+
+    def _process_spans(self, spans: Sequence[ReadableSpan], is_root_span: bool = False) -> SpanExportResult:
+        # Group spans by trace_id for efficient processing
+        spans_by_trace = {}
+        root_span_traces = set()
+        
+        for span in spans:
+            if self.skip_export(span):
+                continue
+            
+            trace_id = span.context.trace_id
+            if trace_id not in spans_by_trace:
+                spans_by_trace[trace_id] = []
+            spans_by_trace[trace_id].append(span)
+            
+            # Check if this span is a root span
+            if not span.parent:
+                root_span_traces.add(trace_id)
+        
+        # Process spans for each trace
+        for trace_id, trace_spans in spans_by_trace.items():
+            service_name = trace_spans[0].resource.attributes.get(SERVICE_NAME, "unknown")
+            handle, file_path, is_first_span = self._get_or_create_handle(trace_id, service_name)
+            
+            if handle is None:
+                continue
+            
+            for span in trace_spans:
+                if not is_first_span:
+                    try:
+                        handle.write(",")
+                    except Exception as e:
+                        print(f"Error writing comma to file {file_path} for span {span.context.span_id}: {e}")
+                        continue
+                
+                try:
+                    handle.write(self.formatter(span))
+                    if is_first_span:
+                        self._mark_span_written(trace_id)
+                        is_first_span = False
+                except Exception as e:
+                    print(f"Error formatting span {span.context.span_id}: {e}")
+                    continue
+        
+        # Close handles for traces with root spans
+        for trace_id in root_span_traces:
+            self._close_trace_handle(trace_id)
+        
+        # Flush remaining handles
+        for trace_id, (handle, file_path, _, _) in self.file_handles.items():
+            if trace_id not in root_span_traces:
+                try:
+                    if handle is not None:
+                        handle.flush()
+                except Exception as e:
+                    print(f"Error flushing file {file_path}: {e}")
+        
+        return SpanExportResult.SUCCESS
+
+    def force_flush(self, timeout_millis: int = 30000) -> bool:
+        """Flush all open file handles."""
+        for trace_id, (handle, file_path, _, _) in self.file_handles.items():
+            try:
+                if handle is not None:
+                    handle.flush()
+            except Exception as e:
+                print(f"Error flushing file {file_path}: {e}")
+        return True
+
+    def shutdown(self) -> None:
+        """Close all file handles and stop task processor."""
+        if hasattr(self, 'task_processor') and self.task_processor is not None:
+            self.task_processor.stop()
+        
+        # Close all remaining file handles
+        trace_ids_to_close = list(self.file_handles.keys())
+        for trace_id in trace_ids_to_close:
+            self._close_trace_handle(trace_id)

monocle_apptrace-0.5.0/src/monocle_apptrace/instrumentation/common/__init__.py

@@ -0,0 +1,17 @@
+from .instrumentor import (
+    setup_monocle_telemetry, 
+    start_trace, 
+    stop_trace, 
+    start_scope, 
+    stop_scope, 
+    http_route_handler, 
+    monocle_trace_scope, 
+    amonocle_trace_scope,
+    monocle_trace_scope_method, 
+    monocle_trace, 
+    amonocle_trace,
+    monocle_trace_method,
+    monocle_trace_http_route,
+    is_valid_trace_id_uuid
+)
+from .utils import MonocleSpanException

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/src/monocle_apptrace/instrumentation/common/constants.py

@@ -57,6 +57,12 @@ llm_type_map = {
     "chatcompletionsclient": "azure_ai_inference",
     "embeddingsclient": "azure_ai_inference",
     "imageembeddingsclient": "azure_ai_inference",
+    "chatbedrockconverse": "aws_bedrock",
+    "googleaigeminichatgenerator": "gemini",
+    "gemini": "gemini",
+    "chatgooglegenerativeai": "gemini",
+    "azurechatcompletion": "azure_openai",
+    "openaichatcompletion": "openai",
 }
 
 MONOCLE_INSTRUMENTOR = "monocle_apptrace"
@@ -81,4 +87,11 @@ WORKFLOW_TYPE_GENERIC = "workflow.generic"
 MONOCLE_SDK_VERSION = "monocle_apptrace.version"
 MONOCLE_SDK_LANGUAGE = "monocle_apptrace.language"
 MONOCLE_DETECTED_SPAN_ERROR = "monocle_apptrace.detected_span_error"
-HTTP_SUCCESS_CODES = ('200', '201', '202', '204', '205', '206')
+HTTP_SUCCESS_CODES = ('200', '201', '202', '204', '205', '206')
+CHILD_ERROR_CODE = "child.error.code"
+
+AGENT_PREFIX_KEY = "monocle.agent.prefix"
+
+INFERENCE_AGENT_DELEGATION = "delegation"
+INFERENCE_TOOL_CALL = "tool_call"
+INFERENCE_COMMUNICATION = "turn"

{monocle_apptrace-0.4.2 → monocle_apptrace-0.5.0}/src/monocle_apptrace/instrumentation/common/instrumentor.py

@@ -1,23 +1,19 @@
 import logging
 import inspect
 from typing import Collection, Dict, List, Union
-import random
 import uuid
 import inspect
 from opentelemetry import trace
-from contextlib import contextmanager
-from opentelemetry.context import attach, get_value, set_value, get_current, detach
+from opentelemetry.context import attach, get_value, set_value
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
-from opentelemetry.trace import SpanContext
-from opentelemetry.sdk.trace import TracerProvider, Span, id_generator
+from opentelemetry.sdk.trace import TracerProvider, Span
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import Span, TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
 from opentelemetry.trace import get_tracer
 from wrapt import wrap_function_wrapper
-from opentelemetry.trace.propagation import set_span_in_context, _SPAN_KEY
 from monocle_apptrace.exporters.monocle_exporters import get_monocle_exporter
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler, NonFrameworkSpanHandler
 from monocle_apptrace.instrumentation.common.wrapper_method import (
@@ -27,10 +23,11 @@ from monocle_apptrace.instrumentation.common.wrapper_method import (
 )
 from monocle_apptrace.instrumentation.common.wrapper import scope_wrapper, ascope_wrapper, monocle_wrapper, amonocle_wrapper
 from monocle_apptrace.instrumentation.common.utils import (
-    set_scope, remove_scope, http_route_handler, load_scopes, http_async_route_handler
+    load_scopes
 )
-from monocle_apptrace.instrumentation.common.constants import MONOCLE_INSTRUMENTOR, WORKFLOW_TYPE_GENERIC
+from monocle_apptrace.instrumentation.common.constants import MONOCLE_INSTRUMENTOR
 from functools import wraps
+
 logger = logging.getLogger(__name__)
 
 SESSION_PROPERTIES_KEY = "session"
@@ -229,49 +226,6 @@ def on_processor_start(span: Span, parent_context):
 def set_context_properties(properties: dict) -> None:
     attach(set_value(SESSION_PROPERTIES_KEY, properties))
 
-def start_trace():
-    """
-    Starts a new trace. All the spans created after this call will be part of the same trace. 
-    Returns:
-        Token: A token representing the attached context for the workflow span.
-                      This token is to be used later to stop the current trace.
-                      Returns None if tracing fails.
-    
-    Raises:
-        Exception: The function catches all exceptions internally and logs a warning.
-    """
-    try:
-        tracer = get_tracer(instrumenting_module_name= MONOCLE_INSTRUMENTOR, tracer_provider= get_tracer_provider())
-        span = tracer.start_span(name = "workflow")
-        updated_span_context = set_span_in_context(span=span)
-        SpanHandler.set_default_monocle_attributes(span)
-        SpanHandler.set_workflow_properties(span)
-        token = attach(updated_span_context)
-        return token
-    except Exception as e:
-        logger.warning("Failed to start trace {e}")
-        return None
-
-def stop_trace(token) -> None:
-    """
-    Stop the active trace and detach workflow type if token is provided. All the spans created after this will not be part of the trace.
-    Args:
-        token: The token that was returned when the trace was started. Used to detach 
-               workflow type. Can be None in which case only the span is ended.
-    Returns:
-        None
-    """
-    try:
-        _parent_span_context = get_current()
-        if _parent_span_context is not None:
-            parent_span: Span = _parent_span_context.get(_SPAN_KEY, None)
-            if parent_span is not None:
-                parent_span.end()
-        if token is not None:
-            detach(token)
-    except:
-        logger.warning("Failed to stop trace")
-
 def is_valid_trace_id_uuid(traceId: str) -> bool:
     try:
         uuid.UUID(traceId)
@@ -280,105 +234,18 @@ def is_valid_trace_id_uuid(traceId: str) -> bool:
         pass
     return False
 
-def start_scope(scope_name: str, scope_value:str = None) -> object:
-    """
-    Start a new scope with the given name and and optional value. If no value is provided, a random UUID will be generated.
-    All the spans, across traces created after this call will have the scope attached until the scope is stopped.
-    Args:
-        scope_name: The name of the scope.
-        scope_value: Optional value of the scope. If None, a random UUID will be generated.
-    Returns:
-        Token: A token representing the attached context for the scope. This token is to be used later to stop the current scope.
-    """
-    return set_scope(scope_name, scope_value)
-
-def stop_scope(token:object) -> None:
-    """
-    Stop the active scope. All the spans created after this will not have the scope attached.
-    Args:
-        token: The token that was returned when the scope was started.
-    Returns:
-        None
-    """
-    remove_scope(token)
-    return
-
-@contextmanager
-def monocle_trace():
-    """
-    Context manager to start and stop a scope. All the spans, across traces created within the encapsulated code will have same trace ID
-    """
-    token = start_trace()
-    try:
-        yield
-    finally:
-        stop_trace(token)
-
-@contextmanager
-def monocle_trace_scope(scope_name: str, scope_value:str = None):
-    """
-    Context manager to start and stop a scope. All the spans, across traces created within the encapsulated code will have the scope attached.
-    Args:
-        scope_name: The name of the scope.
-        scope_value: Optional value of the scope. If None, a random UUID will be generated."""
-    token = start_scope(scope_name, scope_value)
-    try:
-        yield
-    finally:
-        stop_scope(token)
-    
-def monocle_trace_scope_method(scope_name: str, scope_value:str=None):
-    """
-    Decorator to start and stop a scope for a method. All the spans, across traces created in the method will have the scope attached.
-    """
-    def decorator(func):
-        if inspect.iscoroutinefunction(func):
-            @wraps(func)
-            async def wrapper(*args, **kwargs):
-                token = start_scope(scope_name, scope_value)
-                try:
-                    result = await func(*args, **kwargs)
-                    return result
-                finally:
-                    stop_scope(token)
-            return wrapper
-        else:
-            @wraps(func)
-            def wrapper(*args, **kwargs):
-                token = start_scope(scope_name, scope_value)
-                try:
-                    result = func(*args, **kwargs)
-                    return result
-                finally:
-                    stop_scope(token)
-            return wrapper
-    return decorator
-
-def monocle_trace_http_route(func):
-    """
-    Decorator to start and stop a continue traces and scope for a http route. It will also initiate new scopes from the http headers if configured in ``monocle_scopes.json``
-    All the spans, across traces created in the route will have the scope attached.
-    """
-    if inspect.iscoroutinefunction(func):
-        @wraps(func)
-        async def wrapper(*args, **kwargs):
-            return await http_async_route_handler(func, *args, **kwargs)
-        return wrapper
-    else:
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            return http_route_handler(func, *args, **kwargs)
-        return wrapper
-
-class FixedIdGenerator(id_generator.IdGenerator):
-    def __init__(
-            self,
-            trace_id: int) -> None:
-        self.trace_id = trace_id
-
-    def generate_span_id(self) -> int:
-        return random.getrandbits(64)
-
-    def generate_trace_id(self) -> int:
-        return self.trace_id
+from monocle_apptrace.instrumentation.common.method_wrappers import (
+    monocle_trace_scope_method,
+    amonocle_trace_scope,
+    monocle_trace,
+    amonocle_trace,
+    monocle_trace_method,
+    monocle_trace_http_route,
+    start_scope,
+    stop_scope,
+    start_trace,
+    stop_trace,
+    http_route_handler,
+    monocle_trace_scope,
+)