monocle-apptrace 0.5.0b1__tar.gz → 0.5.1__tar.gz

{monocle_apptrace-0.5.0b1 → monocle_apptrace-0.5.1}/CHANGELOG.md

@@ -1,6 +1,17 @@
+## Version 0.5.1 (2025-08-25)
 
-## Version 0.5.0b1 (2025-08-04)
+- Support injecting synthetic spans and use that for adding delegation span in Google ADK ([#257](https://github.com/monocle2ai/monocle/pull/257))
+- Added monocle subtypes ([#256](https://github.com/monocle2ai/monocle/pull/256))
+- OpenAI agents request span ([#255](https://github.com/monocle2ai/monocle/pull/255))
+- Set scopes for agent request and invocation plus minor fixes ([#253](https://github.com/monocle2ai/monocle/pull/253))
 
+## 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))
@@ -139,3 +150,40 @@
 ## 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))
+
+
+- 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))
+

{monocle_apptrace-0.5.0b1 → monocle_apptrace-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: monocle_apptrace
-Version: 0.5.0b1
+Version: 0.5.1
 Summary: package with monocle genAI tracing
 Project-URL: Homepage, https://github.com/monocle2ai/monocle
 Project-URL: Issues, https://github.com/monocle2ai/monocle/issues
@@ -25,12 +25,14 @@ Requires-Dist: anthropic-haystack; 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.1; 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'
@@ -46,16 +48,19 @@ Requires-Dist: langchain==0.3.25; extra == 'dev'
 Requires-Dist: langchainhub==0.1.21; 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.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: 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'

{monocle_apptrace-0.5.0b1 → monocle_apptrace-0.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "monocle_apptrace"
-version = "0.5.0b1"
+version = "0.5.1"
 authors = []
 description = "package with monocle genAI tracing"
 readme = "README.md"
@@ -52,23 +52,25 @@ 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.5.4',
@@ -77,18 +79,21 @@ dev = [
   'anthropic==0.57.1',
   'anthropic-haystack',
   'pytest-asyncio==0.26.0',
-  'llama-index-llms-anthropic==0.6.19',
+  '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',
+  'a2a-sdk==0.2.8', 
   'httpx==0.28.1',
-  'fastapi>=0.115.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.5.0b1 → monocle_apptrace-0.5.1}/src/monocle_apptrace/exporters/file_exporter.py

@@ -3,6 +3,7 @@
 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
@@ -32,7 +33,7 @@ class FileSpanExporter(SpanExporterBase):
         self.file_handles: Dict[int, Tuple[TextIOWrapper, str, datetime, bool]] = {}
         self.formatter = formatter
         self.service_name = service_name
-        self.output_path = out_path
+        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

{monocle_apptrace-0.5.0b1 → monocle_apptrace-0.5.1}/src/monocle_apptrace/instrumentation/common/__init__.py

@@ -2,16 +2,18 @@ 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 .scope_wrapper import (
+    start_scope, 
+    stop_scope, 
+    monocle_trace_scope, 
+    amonocle_trace_scope,
+    monocle_trace_scope_method
+)
 from .utils import MonocleSpanException

monocle_apptrace-0.5.1/src/monocle_apptrace/instrumentation/common/constants.py

@@ -0,0 +1,180 @@
+# Azure environment constants
+AZURE_ML_ENDPOINT_ENV_NAME = "AZUREML_ENTRY_SCRIPT"
+AZURE_FUNCTION_WORKER_ENV_NAME = "FUNCTIONS_WORKER_RUNTIME"
+AZURE_APP_SERVICE_ENV_NAME = "WEBSITE_SITE_NAME"
+AWS_LAMBDA_ENV_NAME = "AWS_LAMBDA_RUNTIME_API"
+GITHUB_CODESPACE_ENV_NAME = "CODESPACES"
+
+AWS_LAMBDA_FUNCTION_IDENTIFIER_ENV_NAME = "AWS_LAMBDA_FUNCTION_NAME"
+AZURE_FUNCTION_IDENTIFIER_ENV_NAME = "WEBSITE_SITE_NAME"
+AZURE_APP_SERVICE_IDENTIFIER_ENV_NAME = "WEBSITE_DEPLOYMENT_ID"
+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_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
+service_type_map = {
+    AZURE_ML_ENDPOINT_ENV_NAME: AZURE_ML_SERVICE_NAME,
+    AZURE_APP_SERVICE_ENV_NAME: AZURE_APP_SERVICE_NAME,
+    AZURE_FUNCTION_WORKER_ENV_NAME: AZURE_FUNCTION_NAME,
+    AWS_LAMBDA_ENV_NAME: AWS_LAMBDA_SERVICE_NAME,
+    GITHUB_CODESPACE_ENV_NAME: GITHUB_CODESPACE_SERVICE_NAME,
+}
+
+# Env variables to identify infra service name
+service_name_map = {
+    AZURE_APP_SERVICE_NAME: AZURE_APP_SERVICE_IDENTIFIER_ENV_NAME,
+    AZURE_FUNCTION_NAME: AZURE_FUNCTION_IDENTIFIER_ENV_NAME,
+    AZURE_ML_SERVICE_NAME: AZURE_ML_ENDPOINT_ENV_NAME,
+    AWS_LAMBDA_SERVICE_NAME: AWS_LAMBDA_FUNCTION_IDENTIFIER_ENV_NAME,
+    GITHUB_CODESPACE_SERVICE_NAME: GITHUB_CODESPACE_IDENTIFIER_ENV_NAME,
+}
+
+
+llm_type_map = {
+    "sagemakerendpoint": "aws_sagemaker",
+    "azureopenai": "azure_openai",
+    "openai": "openai",
+    "chatopenai": "openai",
+    "azurechatopenai": "azure_openai",
+    "bedrock": "aws_bedrock",
+    "sagemakerllm": "aws_sagemaker",
+    "chatbedrock": "aws_bedrock",
+    "openaigenerator": "openai",
+    "bedrockruntime": "aws_bedrock",
+    "sagemakerruntime": "aws_sagemaker",
+    "anthropic": "anthropic",
+    "chatanthropic": "anthropic",
+    "anthropicchatgenerator": "anthropic",
+    "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"
+WORKFLOW_TYPE_KEY = "workflow_type"
+DATA_INPUT_KEY = "data.input"
+DATA_OUTPUT_KEY = "data.output"
+PROMPT_INPUT_KEY = "data.input"
+PROMPT_OUTPUT_KEY = "data.output"
+QUERY = "input"
+RESPONSE = "response"
+SESSION_PROPERTIES_KEY = "session"
+INFRA_SERVICE_KEY = "infra_service_name"
+META_DATA = "metadata"
+MONOCLE_SCOPE_NAME_PREFIX = "monocle.scope."
+SCOPE_METHOD_LIST = "MONOCLE_SCOPE_METHODS"
+SCOPE_METHOD_FILE = "monocle_scopes.json"
+SCOPE_CONFIG_PATH = "MONOCLE_SCOPE_CONFIG_PATH"
+TRACE_PROPOGATION_URLS = "MONOCLE_TRACE_PROPAGATATION_URLS"
+WORKFLOW_TYPE_KEY = "monocle.workflow_type"
+ADD_NEW_WORKFLOW = "monocle.add_new_workflow"
+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")
+CHILD_ERROR_CODE = "child.error.code"
+
+AGENT_PREFIX_KEY = "monocle.agent.prefix"
+
+# agentic sub types
+INFERENCE_AGENT_DELEGATION = "delegation"
+INFERENCE_TOOL_CALL = "tool_call"
+INFERENCE_TURN_END = "turn_end"
+
+SCOPE_NAME = "scope_name"
+AGENT_INVOCATION_SPAN_NAME = "agentic.invocation"
+AGENT_REQUEST_SPAN_NAME = "agentic.request"
+
+AGENTIC_SPANS = [AGENT_INVOCATION_SPAN_NAME, AGENT_REQUEST_SPAN_NAME]
+
+# Span sub types
+
+## OPTIONAL right next to span.type,  span.subtype:
+## subtype is one perspective , are non overlapping, limitations: only one classification scheme for subtypes
+# 1 planning
+SPAN_SUBTYPE_PLANNING = "planning"
+
+# 2 routing and selection INFERENCE_TOOL_CALL, INFERENCE_AGENT_DELEGATION
+SPAN_SUBTYPE_ROUTING = "routing"
+
+# 3 content processing
+SPAN_SUBTYPE_CONTENT_PROCESSING = "content_processing"
+
+# 4 content generation
+SPAN_SUBTYPE_CONTENT_GENERATION = "content_generation"
+
+# 5 communication INFERENCE_TURN_END
+SPAN_SUBTYPE_COMMUNICATION = "communication"
+
+# 6 transformations , if structured output
+SPAN_SUBTYPE_TRANSFORMATIONS = "transformations"
+
+# 7 domain specific,
+SPAN_SUBTYPE_DOMAIN_SPECIFIC = "domain_specific"
+
+# 8 generic (we may skip this property)
+SPAN_SUBTYPE_GENERIC = "generic"
+
+class SPAN_TYPES:
+    GENERIC = "generic"
+    AGENTIC_DELEGATION = "agentic.delegation"
+    AGENTIC_TOOL_INVOCATION = "agentic.tool.invocation"
+    AGENTIC_INVOCATION = "agentic.invocation"
+    AGENTIC_MCP_INVOCATION = "agentic.mcp.invocation"
+    AGENTIC_REQUEST = "agentic.request"
+
+    # http.process
+    HTTP_PROCESS = "http.process"
+    HTTP_SEND = "http.send"
+
+    RETRIEVAL = "retrieval"
+    INFERENCE = "inference"
+    INFERENCE_FRAMEWORK = "inference.framework"
+
+
+class SPAN_SUBTYPES:
+    PLANNING = SPAN_SUBTYPE_PLANNING
+    ROUTING = SPAN_SUBTYPE_ROUTING
+    CONTENT_PROCESSING = SPAN_SUBTYPE_CONTENT_PROCESSING
+    CONTENT_GENERATION = SPAN_SUBTYPE_CONTENT_GENERATION
+    COMMUNICATION = SPAN_SUBTYPE_COMMUNICATION
+    TRANSFORMATIONS = SPAN_SUBTYPE_TRANSFORMATIONS
+    DOMAIN_SPECIFIC = SPAN_SUBTYPE_DOMAIN_SPECIFIC
+    GENERIC = SPAN_SUBTYPE_GENERIC
+
+
+MAP_ATTRIBUTES_TO_SPAN_SUBTYPE = {
+    # inference attributes
+    INFERENCE_AGENT_DELEGATION: SPAN_SUBTYPES.ROUTING,
+    INFERENCE_TOOL_CALL: SPAN_SUBTYPES.ROUTING,
+    INFERENCE_TURN_END: SPAN_SUBTYPES.COMMUNICATION,
+
+    # agentic span.types
+    SPAN_TYPES.AGENTIC_DELEGATION: SPAN_SUBTYPES.ROUTING,
+    SPAN_TYPES.AGENTIC_TOOL_INVOCATION: SPAN_SUBTYPES.ROUTING,
+    SPAN_TYPES.AGENTIC_INVOCATION: SPAN_SUBTYPES.ROUTING,
+    SPAN_TYPES.AGENTIC_MCP_INVOCATION: SPAN_SUBTYPES.ROUTING,
+    
+    # MAYBE?
+    # agentic span.types
+    SPAN_TYPES.AGENTIC_REQUEST: SPAN_SUBTYPES.PLANNING,
+    
+    
+    
+}

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

@@ -235,17 +235,12 @@ def is_valid_trace_id_uuid(traceId: str) -> bool:
     return False
 
 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,
+    http_route_handler
 )
 

{monocle_apptrace-0.5.0b1 → monocle_apptrace-0.5.1}/src/monocle_apptrace/instrumentation/common/method_wrappers.py

@@ -5,14 +5,13 @@ from functools import wraps
 import inspect
 from opentelemetry.context import attach, get_current, detach
 from opentelemetry.sdk.trace import Span
-from opentelemetry.sdk.trace import Span
+from opentelemetry.trace.span import INVALID_SPAN
 from opentelemetry.trace import get_tracer
-from opentelemetry.trace.propagation import set_span_in_context, _SPAN_KEY
 from contextlib import contextmanager, asynccontextmanager
 from monocle_apptrace.instrumentation.common.span_handler import SpanHandler
-from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper, task_wrapper
+from monocle_apptrace.instrumentation.common.wrapper import atask_wrapper, get_current_monocle_span, set_monocle_span_in_context, task_wrapper
 from monocle_apptrace.instrumentation.common.utils import (
-    set_scope, remove_scope, http_route_handler, http_async_route_handler
+    http_route_handler, http_async_route_handler
 )
 from monocle_apptrace.instrumentation.common.constants import MONOCLE_INSTRUMENTOR
 from monocle_apptrace.instrumentation.common.instrumentor import get_tracer_provider
@@ -48,7 +47,7 @@ def start_trace(
         tracer = get_tracer(instrumenting_module_name= MONOCLE_INSTRUMENTOR, tracer_provider= get_tracer_provider())
         span_name = span_name or "custom_span"
         span = tracer.start_span(name=span_name)
-        updated_span_context = set_span_in_context(span=span)
+        updated_span_context = set_monocle_span_in_context(span=span)
         
         # Set default monocle attributes
         SpanHandler.set_default_monocle_attributes(span)
@@ -57,7 +56,7 @@ def start_trace(
         
         # Set custom attributes and events using common method
         _setup_span_attributes_and_events(span, attributes, events)
-        
+
         token = attach(updated_span_context)
         return token
     except Exception as e:
@@ -81,62 +80,16 @@ def stop_trace(
         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:
-                # Set final attributes and events using common method
-                _setup_span_attributes_and_events(parent_span, final_attributes, final_events)
-                
-                parent_span.end()
+        parent_span = get_current_monocle_span()
+        if parent_span is not None and parent_span != INVALID_SPAN:
+            # Set final attributes and events using common method
+            _setup_span_attributes_and_events(parent_span, final_attributes, final_events)
+            parent_span.end()
         if token is not None:
             detach(token)
     except Exception as e:
         logger.warning(f"Failed to stop trace: {e}")
 
-def start_scope(
-    scope_name: str, 
-    scope_value: Optional[str] = None
-) -> object:
-    """
-    Start a new scope with the given name 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.
-    """
-    try:
-        # Set the scope using existing utility
-        token = set_scope(scope_name, scope_value)
-        return token
-    except Exception as e:
-        logger.warning(f"Failed to start scope: {e}")
-        return None
-
-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
-    """
-    try:
-        # Remove the scope
-        remove_scope(token)
-    except Exception as e:
-        logger.warning(f"Failed to stop scope: {e}")
-    return
-
-
 @contextmanager
 def monocle_trace(
     span_name: Optional[str] = None,
@@ -211,74 +164,6 @@ async def amonocle_trace(
         logger.warning(f"Failed in amonocle_trace: {e}")
         yield  # Still yield to not break the context manager
 
-@contextmanager
-def monocle_trace_scope(
-    scope_name: str, 
-    scope_value: Optional[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)
-
-@asynccontextmanager
-async def amonocle_trace_scope(
-    scope_name: str, 
-    scope_value: Optional[str] = None
-):
-    """
-    Async 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: Optional[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.
-    
-    Args:
-        scope_name: The name of the scope.
-        scope_value: Optional value of the scope. If None, a random UUID will be generated.
-    """
-    def decorator(func):
-        if inspect.iscoroutinefunction(func):
-            @wraps(func)
-            async def wrapper(*args, **kwargs):
-                async with amonocle_trace_scope(
-                    scope_name, scope_value
-                ):
-                    result = await func(*args, **kwargs)
-                    return result
-            return wrapper
-        else:
-            @wraps(func)
-            def wrapper(*args, **kwargs):
-                with monocle_trace_scope(
-                    scope_name, scope_value
-                ):
-                    result = func(*args, **kwargs)
-                    return result
-            return wrapper
-    return decorator
-
 def monocle_trace_method(
     span_name: Optional[str] = None
 ):