microsoft-agents-a365-observability-core 0.2.0.dev5__tar.gz → 0.2.1.dev0__tar.gz

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-core
-Version: 0.2.0.dev5
+Version: 0.2.1.dev0
 Summary: Telemetry, tracing, and monitoring components for AI agents
 Author-email: Microsoft <support@microsoft.com>
 License: MIT
@@ -20,6 +20,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: opentelemetry-api>=1.36.0
 Requires-Dist: opentelemetry-sdk>=1.36.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.36.0
@@ -41,6 +42,7 @@ Requires-Dist: mypy>=1.0.0; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest>=7.0.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Dynamic: license-file
 
 # microsoft-agents-a365-observability-core
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Microsoft Agent 365 Python SDK for OpenTelemetry tracing.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/config.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 import logging
 import threading
@@ -10,7 +11,7 @@ from opentelemetry.sdk.resources import SERVICE_NAME, SERVICE_NAMESPACE, Resourc
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
 
-from .exporters.agent365_exporter import Agent365Exporter
+from .exporters.agent365_exporter import _Agent365Exporter
 from .exporters.agent365_exporter_options import Agent365ExporterOptions
 from .exporters.utils import is_agent365_exporter_enabled
 from .trace_processor.span_processor import SpanProcessor
@@ -53,6 +54,7 @@ class TelemetryManager:
         token_resolver: Callable[[str, str], str | None] | None = None,
         cluster_category: str = "prod",
         exporter_options: Optional[Agent365ExporterOptions] = None,
+        suppress_invoke_agent_input: bool = False,
         **kwargs: Any,
     ) -> bool:
         """
@@ -67,6 +69,7 @@ class TelemetryManager:
             Use exporter_options instead.
         :param exporter_options: Agent365ExporterOptions instance for configuring the exporter.
             If provided, exporter_options takes precedence. If exporter_options is None, the token_resolver and cluster_category parameters are used as fallback/legacy support to construct a default Agent365ExporterOptions instance.
+        :param suppress_invoke_agent_input: If True, suppress input messages for spans that are children of InvokeAgent spans.
         :return: True if configuration succeeded, False otherwise.
         """
         try:
@@ -78,6 +81,7 @@ class TelemetryManager:
                     token_resolver,
                     cluster_category,
                     exporter_options,
+                    suppress_invoke_agent_input,
                     **kwargs,
                 )
         except Exception as e:
@@ -92,10 +96,18 @@ class TelemetryManager:
         token_resolver: Callable[[str, str], str | None] | None = None,
         cluster_category: str = "prod",
         exporter_options: Optional[Agent365ExporterOptions] = None,
+        suppress_invoke_agent_input: bool = False,
         **kwargs: Any,
     ) -> bool:
         """Internal configuration method - not thread-safe, must be called with lock."""
 
+        # Check if a365 observability is already configured
+        if self._tracer_provider is not None:
+            self._logger.warning(
+                "a365 observability already configured. Ignoring repeated configure() call."
+            )
+            return True
+
         # Create resource with service information
         resource = Resource.create(
             {
@@ -104,23 +116,24 @@ class TelemetryManager:
             }
         )
 
-        # Get existing tracer provider or create new one
-        try:
-            tracer_provider = trace.get_tracer_provider()
-            # Check if it's already configured
-            if hasattr(tracer_provider, "resource") and tracer_provider.resource:
-                # Already configured, just add our span processor
-                agent_processor = SpanProcessor()
-                tracer_provider.add_span_processor(agent_processor)
-                self._tracer_provider = tracer_provider
-                self._span_processors["agent"] = agent_processor
-                return True
-        except Exception:
-            pass
-
-        # Configure tracer provider
-        tracer_provider = TracerProvider(resource=resource)
-        trace.set_tracer_provider(tracer_provider)
+        # Check if there's an existing TracerProvider (from app's OTEL setup)
+        tracer_provider = trace.get_tracer_provider()
+
+        # Determine if we should use existing provider or create new one
+        # Check if it's a real TracerProvider with a resource (not a proxy/no-op)
+        if getattr(tracer_provider, "resource", None):
+            # Use existing provider from application's OTEL setup
+            self._logger.info(
+                "Detected existing TracerProvider with resource. "
+                "Adding a365 observability processors to it."
+            )
+        else:
+            # Create new TracerProvider with our resource
+            self._logger.info("Creating new TracerProvider for a365 observability.")
+            tracer_provider = TracerProvider(resource=resource)
+            trace.set_tracer_provider(tracer_provider)
+
+        # Store reference
         self._tracer_provider = tracer_provider
 
         # Use exporter_options if provided, otherwise create default options with legacy parameters
@@ -139,10 +152,11 @@ class TelemetryManager:
         }
 
         if is_agent365_exporter_enabled() and exporter_options.token_resolver is not None:
-            exporter = Agent365Exporter(
+            exporter = _Agent365Exporter(
                 token_resolver=exporter_options.token_resolver,
                 cluster_category=exporter_options.cluster_category,
                 use_s2s_endpoint=exporter_options.use_s2s_endpoint,
+                suppress_invoke_agent_input=suppress_invoke_agent_input,
             )
         else:
             exporter = ConsoleSpanExporter()

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/constants.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Constants for SDK OpenTelemetry implementation.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/execute_tool_scope.py

@@ -5,6 +5,8 @@ from .agent_details import AgentDetails
 from .constants import (
     EXECUTE_TOOL_OPERATION_NAME,
     GEN_AI_EVENT_CONTENT,
+    GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
+    GEN_AI_EXECUTION_SOURCE_NAME_KEY,
     GEN_AI_TOOL_ARGS_KEY,
     GEN_AI_TOOL_CALL_ID_KEY,
     GEN_AI_TOOL_DESCRIPTION_KEY,
@@ -14,6 +16,7 @@ from .constants import (
     SERVER_PORT_KEY,
 )
 from .opentelemetry_scope import OpenTelemetryScope
+from .request import Request
 from .tenant_details import TenantDetails
 from .tool_call_details import ToolCallDetails
 
@@ -26,6 +29,7 @@ class ExecuteToolScope(OpenTelemetryScope):
         details: ToolCallDetails,
         agent_details: AgentDetails,
         tenant_details: TenantDetails,
+        request: Request | None = None,
     ) -> "ExecuteToolScope":
         """Creates and starts a new scope for tool execution tracing.
 
@@ -33,17 +37,19 @@ class ExecuteToolScope(OpenTelemetryScope):
             details: The details of the tool call
             agent_details: The details of the agent making the call
             tenant_details: The details of the tenant
+            request: Optional request details for additional context
 
         Returns:
             A new ExecuteToolScope instance
         """
-        return ExecuteToolScope(details, agent_details, tenant_details)
+        return ExecuteToolScope(details, agent_details, tenant_details, request)
 
     def __init__(
         self,
         details: ToolCallDetails,
         agent_details: AgentDetails,
         tenant_details: TenantDetails,
+        request: Request | None = None,
     ):
         """Initialize the tool execution scope.
 
@@ -51,6 +57,7 @@ class ExecuteToolScope(OpenTelemetryScope):
             details: The details of the tool call
             agent_details: The details of the agent making the call
             tenant_details: The details of the tenant
+            request: Optional request details for additional context
         """
         super().__init__(
             kind="Internal",
@@ -79,6 +86,13 @@ class ExecuteToolScope(OpenTelemetryScope):
             if endpoint.port and endpoint.port != 443:
                 self.set_tag_maybe(SERVER_PORT_KEY, endpoint.port)
 
+        # Set request metadata if provided
+        if request and request.source_metadata:
+            self.set_tag_maybe(GEN_AI_EXECUTION_SOURCE_NAME_KEY, request.source_metadata.name)
+            self.set_tag_maybe(
+                GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY, request.source_metadata.description
+            )
+
     def record_response(self, response: str) -> None:
         """Records response information for telemetry tracking.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/execution_type.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Execution type enum.
 

microsoft_agents_a365_observability_core-0.2.1.dev0/microsoft_agents_a365/observability/core/exporters/__init__.py

@@ -0,0 +1,8 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+from .agent365_exporter_options import Agent365ExporterOptions
+
+# Agent365Exporter is not exported intentionally.
+# It should only be used internally by the observability core module.
+__all__ = ["Agent365ExporterOptions"]

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/exporters/agent365_exporter.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # pip install opentelemetry-sdk opentelemetry-api requests
 
@@ -9,7 +10,8 @@ import logging
 import threading
 import time
 from collections.abc import Callable, Sequence
-from typing import Any
+from typing import Any, final
+from urllib.parse import urlparse
 
 import requests
 from microsoft_agents_a365.runtime.power_platform_api_discovery import PowerPlatformApiDiscovery
@@ -17,7 +19,13 @@ from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
 from opentelemetry.trace import StatusCode
 
+from ..constants import (
+    GEN_AI_INPUT_MESSAGES_KEY,
+    GEN_AI_OPERATION_NAME_KEY,
+    INVOKE_AGENT_OPERATION_NAME,
+)
 from .utils import (
+    get_validated_domain_override,
     hex_span_id,
     hex_trace_id,
     kind_name,
@@ -36,7 +44,8 @@ DEFAULT_MAX_RETRIES = 3
 logger = logging.getLogger(__name__)
 
 
-class Agent365Exporter(SpanExporter):
+@final
+class _Agent365Exporter(SpanExporter):
     """
     Agent 365 span exporter for Agent 365:
       * Partitions spans by (tenantId, agentId)
@@ -50,6 +59,7 @@ class Agent365Exporter(SpanExporter):
         token_resolver: Callable[[str, str], str | None],
         cluster_category: str = "prod",
         use_s2s_endpoint: bool = False,
+        suppress_invoke_agent_input: bool = False,
     ):
         if token_resolver is None:
             raise ValueError("token_resolver must be provided.")
@@ -59,6 +69,9 @@ class Agent365Exporter(SpanExporter):
         self._token_resolver = token_resolver
         self._cluster_category = cluster_category
         self._use_s2s_endpoint = use_s2s_endpoint
+        self._suppress_invoke_agent_input = suppress_invoke_agent_input
+        # Read domain override once at initialization
+        self._domain_override = get_validated_domain_override()
 
     # ------------- SpanExporter API -----------------
 
@@ -85,14 +98,29 @@ class Agent365Exporter(SpanExporter):
                 body = json.dumps(payload, separators=(",", ":"), ensure_ascii=False)
 
                 # Resolve endpoint + token
-                discovery = PowerPlatformApiDiscovery(self._cluster_category)
-                endpoint = discovery.get_tenant_island_cluster_endpoint(tenant_id)
+                if self._domain_override:
+                    endpoint = self._domain_override
+                else:
+                    discovery = PowerPlatformApiDiscovery(self._cluster_category)
+                    endpoint = discovery.get_tenant_island_cluster_endpoint(tenant_id)
+
                 endpoint_path = (
                     f"/maven/agent365/service/agents/{agent_id}/traces"
                     if self._use_s2s_endpoint
                     else f"/maven/agent365/agents/{agent_id}/traces"
                 )
-                url = f"https://{endpoint}{endpoint_path}?api-version=1"
+
+                # Construct URL - if endpoint has a scheme (http:// or https://), use it as-is
+                # Otherwise, prepend https://
+                # Note: Check for "://" to distinguish between real protocols and domain:port format
+                # (urlparse treats "example.com:8080" as having scheme="example.com")
+                parsed = urlparse(endpoint)
+                if parsed.scheme and "://" in endpoint:
+                    # Endpoint is a full URL, append path
+                    url = f"{endpoint}{endpoint_path}?api-version=1"
+                else:
+                    # Endpoint is just a domain (possibly with port), prepend https://
+                    url = f"https://{endpoint}{endpoint_path}?api-version=1"
 
                 # Debug: Log endpoint being used
                 logger.info(
@@ -141,6 +169,8 @@ class Agent365Exporter(SpanExporter):
     def force_flush(self, timeout_millis: int = 30000) -> bool:
         return True
 
+    # ------------- Helper methods -------------------
+
     # ------------- HTTP helper ----------------------
 
     @staticmethod
@@ -257,6 +287,20 @@ class Agent365Exporter(SpanExporter):
 
         # attributes
         attrs = dict(sp.attributes or {})
+
+        # Suppress input messages if configured and current span is an InvokeAgent span
+        if self._suppress_invoke_agent_input:
+            # Check if current span is an InvokeAgent span by:
+            # 1. Span name starts with "invoke_agent"
+            # 2. Has attribute gen_ai.operation.name set to INVOKE_AGENT_OPERATION_NAME
+            operation_name = attrs.get(GEN_AI_OPERATION_NAME_KEY)
+            if (
+                sp.name.startswith(INVOKE_AGENT_OPERATION_NAME)
+                and operation_name == INVOKE_AGENT_OPERATION_NAME
+            ):
+                # Remove input messages attribute
+                attrs.pop(GEN_AI_INPUT_MESSAGES_KEY, None)
+
         # events
         events = []
         for ev in sp.events:

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/exporters/utils.py

@@ -1,10 +1,12 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 import json
 import logging
 import os
 from collections.abc import Sequence
 from typing import Any
+from urllib.parse import urlparse
 
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.trace import SpanKind, StatusCode
@@ -142,6 +144,59 @@ def partition_by_identity(
     return groups
 
 
+def get_validated_domain_override() -> str | None:
+    """
+    Get and validate the domain override from environment variable.
+
+    Returns:
+        The validated domain override, or None if not set or invalid.
+    """
+    domain_override = os.getenv("A365_OBSERVABILITY_DOMAIN_OVERRIDE", "").strip()
+    if not domain_override:
+        return None
+
+    # Validate that it's a valid URL
+    try:
+        parsed = urlparse(domain_override)
+
+        # If scheme is present and looks like a protocol (contains //)
+        # Note: We check for "://" because urlparse treats "example.com:8080" as having
+        # scheme="example.com", but this is actually a domain with port, not a protocol.
+        if parsed.scheme and "://" in domain_override:
+            # Validate it's http or https
+            if parsed.scheme not in ("http", "https"):
+                logger.warning(
+                    f"Invalid domain override '{domain_override}': "
+                    f"scheme must be http or https, got '{parsed.scheme}'"
+                )
+                return None
+            # Must have a netloc (hostname) when scheme is present
+            if not parsed.netloc:
+                logger.warning(f"Invalid domain override '{domain_override}': missing hostname")
+                return None
+        else:
+            # If no scheme with ://, it should be a domain with optional port (no path)
+            # Note: domain can contain : for port (e.g., example.com:8080)
+            # Reject malformed URLs like "http:8080" that look like protocols but aren't
+            if domain_override.startswith(("http:", "https:")) and "://" not in domain_override:
+                logger.warning(
+                    f"Invalid domain override '{domain_override}': "
+                    "malformed URL - protocol requires '://'"
+                )
+                return None
+            if "/" in domain_override:
+                logger.warning(
+                    f"Invalid domain override '{domain_override}': "
+                    "domain without protocol should not contain path separators (/)"
+                )
+                return None
+    except Exception as e:
+        logger.warning(f"Invalid domain override '{domain_override}': {e}")
+        return None
+
+    return domain_override
+
+
 def is_agent365_exporter_enabled() -> bool:
     """Check if Agent 365 exporter is enabled."""
     # Check environment variable

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/inference_call_details.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 from dataclasses import dataclass
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/inference_operation_type.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 from enum import Enum
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/inference_scope.py

@@ -5,6 +5,8 @@ from typing import List
 
 from .agent_details import AgentDetails
 from .constants import (
+    GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
+    GEN_AI_EXECUTION_SOURCE_NAME_KEY,
     GEN_AI_INPUT_MESSAGES_KEY,
     GEN_AI_OPERATION_NAME_KEY,
     GEN_AI_OUTPUT_MESSAGES_KEY,
@@ -90,6 +92,13 @@ class InferenceScope(OpenTelemetryScope):
         )
         self.set_tag_maybe(GEN_AI_RESPONSE_ID_KEY, details.responseId)
 
+        # Set request metadata if provided
+        if request and request.source_metadata:
+            self.set_tag_maybe(GEN_AI_EXECUTION_SOURCE_NAME_KEY, request.source_metadata.name)
+            self.set_tag_maybe(
+                GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY, request.source_metadata.description
+            )
+
     def record_input_messages(self, messages: List[str]) -> None:
         """Records the input messages for telemetry tracking.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/invoke_agent_details.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Data class for invoke agent details.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/middleware/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Middleware components for Microsoft Agent 365 SDK.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/middleware/baggage_builder.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Per request baggage builder for OpenTelemetry context propagation.
 
@@ -31,7 +32,6 @@ from ..constants import (
 )
 from ..models.operation_source import OperationSource
 from ..utils import deprecated, validate_and_normalize_ip
-from .turn_context_baggage import from_turn_context
 
 logger = logging.getLogger(__name__)
 
@@ -43,14 +43,17 @@ class BaggageBuilder:
     propagated in the OpenTelemetry context.
 
     Example:
-        >>> with BaggageBuilder() \
-        ...     .tenant_id("tenant-123") \
-        ...     .agent_id("agent-456") \
-        ...     .correlation_id("corr-789") \
-        ...     .build():
-        ...     # Baggage is set in this context
-        ...     pass
-        >>> # Baggage is restored after exiting the context
+        .. code-block:: python
+
+            builder = (BaggageBuilder()
+                       .tenant_id("tenant-123")
+                       .agent_id("agent-456")
+                       .correlation_id("corr-789"))
+
+            with builder.build():
+                # Baggage is set in this context
+                pass
+            # Baggage is restored after exiting the context
     """
 
     def __init__(self):
@@ -232,14 +235,6 @@ class BaggageBuilder:
         self._set(GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY, value)
         return self
 
-    def from_turn_context(self, turn_context: Any) -> "BaggageBuilder":
-        """
-        Populate baggage from a turn_context (duck-typed).
-        Delegates to baggage_turn_context.from_turn_context.
-        """
-
-        return self.set_pairs(from_turn_context(turn_context))
-
     def set_pairs(self, pairs: Any) -> "BaggageBuilder":
         """
         Accept dict or iterable of (k,v).

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/opentelemetry_scope.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Base class for OpenTelemetry tracing scopes.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/request.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Request class.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/source_metadata.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Source metadata class.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/tenant_details.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Tenant details class.
 from dataclasses import dataclass

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/tool_call_details.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Data class for tool call details.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/tool_type.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 # Tool type enum.
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/trace_processor/__init__.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 """
 Trace Processors

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/trace_processor/span_processor.py

@@ -1,6 +1,7 @@
-"""Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
-Span processor for copying OpenTelemetry baggage entries onto spans.
+"""Span processor for copying OpenTelemetry baggage entries onto spans.
 
 This implementation assumes `opentelemetry.baggage.get_all` is available with the
 signature `get_all(context: Context | None) -> Mapping[str, object]`.

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365/observability/core/trace_processor/util.py

@@ -1,4 +1,5 @@
-# Copyright (c) Microsoft. All rights reserved.
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
 
 from .. import constants as consts
 
@@ -23,6 +24,7 @@ COMMON_ATTRIBUTES = [
     consts.SESSION_ID_KEY,
     consts.SESSION_DESCRIPTION_KEY,
     consts.HIRING_MANAGER_ID_KEY,
+    consts.GEN_AI_CALLER_CLIENT_IP_KEY,  # gen_ai.caller.client.ip
     # Execution context
     consts.GEN_AI_EXECUTION_SOURCE_NAME_KEY,  # gen_ai.channel.name
     consts.GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,  # gen_ai.channel.link

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365_observability_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microsoft-agents-a365-observability-core
-Version: 0.2.0.dev5
+Version: 0.2.1.dev0
 Summary: Telemetry, tracing, and monitoring components for AI agents
 Author-email: Microsoft <support@microsoft.com>
 License: MIT
@@ -20,6 +20,7 @@ Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: System :: Monitoring
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: opentelemetry-api>=1.36.0
 Requires-Dist: opentelemetry-sdk>=1.36.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.36.0
@@ -41,6 +42,7 @@ Requires-Dist: mypy>=1.0.0; extra == "dev"
 Provides-Extra: test
 Requires-Dist: pytest>=7.0.0; extra == "test"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Dynamic: license-file
 
 # microsoft-agents-a365-observability-core
 

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365_observability_core.egg-info/SOURCES.txt

@@ -1,6 +1,9 @@
 README.md
 pyproject.toml
 setup.py
+../../LICENSE
+docs/../../LICENSE
+microsoft_agents_a365/../../LICENSE
 microsoft_agents_a365/observability/core/__init__.py
 microsoft_agents_a365/observability/core/agent_details.py
 microsoft_agents_a365/observability/core/config.py
@@ -19,12 +22,12 @@ microsoft_agents_a365/observability/core/tenant_details.py
 microsoft_agents_a365/observability/core/tool_call_details.py
 microsoft_agents_a365/observability/core/tool_type.py
 microsoft_agents_a365/observability/core/utils.py
+microsoft_agents_a365/observability/core/exporters/__init__.py
 microsoft_agents_a365/observability/core/exporters/agent365_exporter.py
 microsoft_agents_a365/observability/core/exporters/agent365_exporter_options.py
 microsoft_agents_a365/observability/core/exporters/utils.py
 microsoft_agents_a365/observability/core/middleware/__init__.py
 microsoft_agents_a365/observability/core/middleware/baggage_builder.py
-microsoft_agents_a365/observability/core/middleware/turn_context_baggage.py
 microsoft_agents_a365/observability/core/models/__init__.py
 microsoft_agents_a365/observability/core/models/agent_type.py
 microsoft_agents_a365/observability/core/models/caller_details.py

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/microsoft_agents_a365_observability_core.egg-info/top_level.txt

@@ -1 +1,2 @@
+docs
 microsoft_agents_a365

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/pyproject.toml

@@ -80,6 +80,10 @@ target-version = ['py311']
 line-length = 100
 target-version = "py311"
 
+[tool.ruff.lint.flake8-copyright]
+notice-rgx = "# Copyright \\(c\\) Microsoft Corporation\\.\\r?\\n# Licensed under the MIT License\\."
+min-file-size = 1
+
 [tool.mypy]
 python_version = "3.11"
 strict = true

{microsoft_agents_a365_observability_core-0.2.0.dev5 → microsoft_agents_a365_observability_core-0.2.1.dev0}/setup.py

@@ -13,7 +13,7 @@ package_version = environ.get("AGENT365_PYTHON_SDK_PACKAGE_VERSION", "0.0.0")
 helper_path = Path(__file__).parent.parent.parent / "versioning" / "helper"
 sys.path.insert(0, str(helper_path))
 
-from setup_utils import get_dynamic_dependencies
+from setup_utils import get_dynamic_dependencies  # noqa: E402
 
 # Use minimum version strategy:
 # - Internal packages get: >= current_base_version (e.g., >= 0.1.0)

microsoft_agents_a365_observability_core-0.2.0.dev5/microsoft_agents_a365/observability/core/middleware/turn_context_baggage.py

@@ -1,192 +0,0 @@
-from __future__ import annotations
-
-import json
-from typing import Any, Iterator, Mapping
-
-from ..constants import (
-    GEN_AI_AGENT_AUID_KEY,
-    GEN_AI_AGENT_DESCRIPTION_KEY,
-    GEN_AI_AGENT_ID_KEY,
-    GEN_AI_AGENT_NAME_KEY,
-    GEN_AI_AGENT_UPN_KEY,
-    GEN_AI_CALLER_ID_KEY,
-    GEN_AI_CALLER_NAME_KEY,
-    GEN_AI_CALLER_TENANT_ID_KEY,
-    GEN_AI_CALLER_UPN_KEY,
-    GEN_AI_CALLER_USER_ID_KEY,
-    GEN_AI_CONVERSATION_ID_KEY,
-    GEN_AI_CONVERSATION_ITEM_LINK_KEY,
-    GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY,
-    GEN_AI_EXECUTION_SOURCE_NAME_KEY,
-    GEN_AI_EXECUTION_TYPE_KEY,
-    TENANT_ID_KEY,
-)
-from ..execution_type import ExecutionType
-
-AGENT_ROLE = "agenticUser"
-CHANNEL_ID_AGENTS = "agents"
-
-
-def _safe_get(obj: Any, *names: str) -> Any:
-    """Attempt multiple attribute/dict keys; return first non-None."""
-    for n in names:
-        if obj is None:
-            continue
-        # dict-like
-        if isinstance(obj, Mapping) and n in obj:
-            return obj[n]
-        # attribute-like (support both camelCase and snake_case lookups)
-        if hasattr(obj, n):
-            return getattr(obj, n)
-    return None
-
-
-def _extract_channel_data(activity: Any) -> Mapping[str, Any] | None:
-    cd = _safe_get(activity, "channel_data")
-    if cd is None:
-        return None
-    if isinstance(cd, Mapping):
-        return cd
-    if isinstance(cd, str):
-        try:
-            return json.loads(cd)
-        except Exception:
-            return None
-    return None
-
-
-def _iter_caller_pairs(activity: Any) -> Iterator[tuple[str, Any]]:
-    frm = _safe_get(activity, "from")
-    if not frm:
-        return
-    yield GEN_AI_CALLER_ID_KEY, _safe_get(frm, "id")
-    name = _safe_get(frm, "name")
-    yield GEN_AI_CALLER_NAME_KEY, name
-    # Reuse 'name' as UPN if no separate field
-    upn = _safe_get(frm, "upn") or name
-    yield GEN_AI_CALLER_UPN_KEY, upn
-    user_id = _safe_get(frm, "agentic_user_id", "aad_object_id")
-    yield GEN_AI_CALLER_USER_ID_KEY, user_id
-    tenant_id = _safe_get(frm, "tenant_id")
-    yield GEN_AI_CALLER_TENANT_ID_KEY, tenant_id
-
-
-def _is_agentic(entity: Any) -> bool:
-    return bool(
-        _safe_get(
-            entity,
-            "agentic_user_id",
-        )
-        or (
-            (role := _safe_get(entity, "role", "Role"))
-            and isinstance(role, str)
-            and role.lower() == AGENT_ROLE.lower()
-        )
-    )
-
-
-def _iter_execution_type_pair(activity: Any) -> Iterator[tuple[str, Any]]:
-    frm = _safe_get(activity, "from")
-    rec = _safe_get(activity, "recipient")
-    is_agentic_caller = _is_agentic(frm)
-    is_agentic_recipient = _is_agentic(rec)
-    exec_type = (
-        ExecutionType.AGENT_TO_AGENT.value
-        if (is_agentic_caller and is_agentic_recipient)
-        else ExecutionType.HUMAN_TO_AGENT.value
-    )
-    yield GEN_AI_EXECUTION_TYPE_KEY, exec_type
-
-
-def _iter_target_agent_pairs(activity: Any) -> Iterator[tuple[str, Any]]:
-    rec = _safe_get(activity, "recipient")
-    if not rec:
-        return
-    yield GEN_AI_AGENT_ID_KEY, _safe_get(rec, "agentic_app_id")
-    yield GEN_AI_AGENT_NAME_KEY, _safe_get(rec, "name")
-    auid = _safe_get(rec, "agentic_user_id", "aad_object_id")
-    yield GEN_AI_AGENT_AUID_KEY, auid
-    yield GEN_AI_AGENT_UPN_KEY, _safe_get(rec, "upn", "name")
-    yield (
-        GEN_AI_AGENT_DESCRIPTION_KEY,
-        _safe_get(rec, "role"),
-    )
-
-
-def _iter_tenant_id_pair(activity: Any) -> Iterator[tuple[str, Any]]:
-    rec = _safe_get(activity, "recipient")
-    tenant_id = _safe_get(rec, "tenant_id")
-    if not tenant_id:
-        cd_dict = _extract_channel_data(activity)
-        # channelData.tenant.id
-        try:
-            tenant_id = (
-                cd_dict
-                and isinstance(cd_dict.get("tenant"), Mapping)
-                and cd_dict["tenant"].get("id")
-            )
-        except Exception:
-            tenant_id = None
-    yield TENANT_ID_KEY, tenant_id
-
-
-def _iter_source_metadata_pairs(activity: Any) -> Iterator[tuple[str, Any]]:
-    """
-    Generate source metadata pairs from activity, handling both string and ChannelId object cases.
-
-    :param activity: The activity object (Activity instance or dict)
-    :return: Iterator of (key, value) tuples for source metadata
-    """
-    # Handle channel_id (can be string or ChannelId object)
-    channel_id = _safe_get(activity, "channel_id")
-
-    # Extract channel name from either string or ChannelId object
-    channel_name = None
-    sub_channel = None
-
-    if channel_id is not None:
-        if isinstance(channel_id, str):
-            # Direct string value
-            channel_name = channel_id
-        elif hasattr(channel_id, "channel"):
-            # ChannelId object
-            channel_name = channel_id.channel
-            sub_channel = getattr(channel_id, "sub_channel", None)
-        elif isinstance(channel_id, dict):
-            # Serialized ChannelId as dict
-            channel_name = channel_id.get("channel")
-            sub_channel = channel_id.get("sub_channel")
-
-    # Yield channel name as source name
-    yield GEN_AI_EXECUTION_SOURCE_NAME_KEY, channel_name
-    yield GEN_AI_EXECUTION_SOURCE_DESCRIPTION_KEY, sub_channel
-
-
-def _iter_conversation_pairs(activity: Any) -> Iterator[tuple[str, Any]]:
-    conv = _safe_get(activity, "conversation")
-    conversation_id = _safe_get(conv, "id")
-
-    item_link = _safe_get(activity, "service_url")
-
-    yield GEN_AI_CONVERSATION_ID_KEY, conversation_id
-    yield GEN_AI_CONVERSATION_ITEM_LINK_KEY, item_link
-
-
-def _iter_all_pairs(turn_context: Any) -> Iterator[tuple[str, Any]]:
-    activity = _safe_get(
-        turn_context,
-        "activity",
-    )
-    if not activity:
-        return
-    yield from _iter_caller_pairs(activity)
-    yield from _iter_execution_type_pair(activity)
-    yield from _iter_target_agent_pairs(activity)
-    yield from _iter_tenant_id_pair(activity)
-    yield from _iter_source_metadata_pairs(activity)
-    yield from _iter_conversation_pairs(activity)
-
-
-def from_turn_context(turn_context: Any) -> dict:
-    """Populate builder with baggage values extracted from a turn context."""
-    return dict(_iter_all_pairs(turn_context))