warpzone-sdk 15.0.0.dev7__py3-none-any.whl → 15.0.0.dev9__py3-none-any.whl

warpzone/function/monitor.py

@@ -1,49 +1,14 @@
 import inspect
-import threading
 from contextlib import contextmanager
 from typing import Callable
 
 import azure.functions as func
-from azure.monitor.opentelemetry import configure_azure_monitor
-from opentelemetry import trace
 
 from warpzone.function.types import SingleArgumentCallable
 from warpzone.monitor import traces
 
-# Thread-safe lazy initialization of Azure Monitor
-_azure_monitor_configured = False
-_azure_monitor_lock = threading.Lock()
-
-
-def _ensure_azure_monitor_configured():
-    """Ensure Azure Monitor is configured exactly once, thread-safely."""
-    global _azure_monitor_configured
-    if _azure_monitor_configured:
-        return
-
-    with _azure_monitor_lock:
-        # Double-check after acquiring lock
-        if _azure_monitor_configured:
-            return
-
-        # Disable OpenTelemetry logging instrumentation - let Azure Functions
-        # handle log correlation via its native thread-local storage mechanism.
-        # This prevents conflicts between OpenTelemetry's context-based correlation
-        # and Azure Functions' invocation_id-based correlation which can cause
-        # logs to leak between concurrent function invocations.
-        configure_azure_monitor(
-            disable_logging=True,
-        )
-
-        # Apply trace filtering to suppress all Azure SDK traces except Service Bus
-        tracer_provider = trace.get_tracer_provider()
-        if hasattr(tracer_provider, "_active_span_processor"):
-            original_processor = tracer_provider._active_span_processor
-            filtered_processor = traces.AzureSDKTraceFilter(original_processor)
-            tracer_provider._active_span_processor = filtered_processor
-
-        _azure_monitor_configured = True
-
+# Configure tracing at import time (once per worker process)
+traces.configure_tracing()
 
 SUBJECT_IDENTIFIER = "<Subject>"
 
@@ -51,8 +16,9 @@ SUBJECT_IDENTIFIER = "<Subject>"
 @contextmanager
 def run_in_trace_context(context: func.Context):
     trace_context = context.trace_context
-    span_name = context.function_name or "azure_function"
-    with traces.set_trace_context(trace_context.trace_parent, span_name=span_name):
+    with traces.set_trace_context(
+        trace_context.trace_parent, trace_context.trace_state
+    ):
         yield
 
 
@@ -74,8 +40,6 @@ def monitor(main: SingleArgumentCallable) -> Callable:
             - return value
                 description: return value of original function
     """
-    # Ensure Azure Monitor is configured before any function runs
-    _ensure_azure_monitor_configured()
 
     async def wrapper_async(arg, context: func.Context):
         with run_in_trace_context(context):

warpzone/monitor/traces.py

@@ -1,87 +1,117 @@
+import logging
+import os
 from contextlib import contextmanager
 
 from azure.core.settings import settings
+from azure.monitor.opentelemetry.exporter import AzureMonitorTraceExporter
 from opentelemetry import context, trace
-from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
+from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor, TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.sdk.trace.sampling import ALWAYS_ON
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
 
+# Enable OpenTelemetry tracing for Azure SDK (including Service Bus)
+# This must be set before any Azure SDK clients are created
 settings.tracing_implementation = "opentelemetry"
 
+logger = logging.getLogger(__name__)
+
+_TRACING_IS_CONFIGURED = False
+
+# Span name prefixes to allow from Azure SDK (Service Bus for function chaining)
+_ALLOWED_AZURE_SPAN_NAMES = frozenset({"ServiceBus.message"})
+
 
 class AzureSDKTraceFilter(SpanProcessor):
-    """Custom SpanProcessor to filter out Azure SDK traces except Service Bus.
+    """SpanProcessor that filters out noisy Azure SDK traces.
+
+    Allows:
+    - All non-Azure SDK spans (custom/user traces)
+    - Service Bus spans (for tracing function chains)
 
-    It drops spans from Azure SDK libraries except Service Bus messages,
-    preventing them from being exported to Azure Monitor.
+    Drops:
+    - Other Azure SDK spans (HTTP client, blob storage, etc.)
     """
 
     def __init__(self, wrapped_processor: SpanProcessor):
-        """Initialize with the actual processor to wrap.
-
-        Args:
-            wrapped_processor: The underlying processor (e.g., BatchSpanProcessor)
-        """
         self.wrapped_processor = wrapped_processor
 
     def on_start(
         self, span: ReadableSpan, parent_context: context.Context = None
     ) -> None:
-        """Called when a span is started."""
         self.wrapped_processor.on_start(span, parent_context)
 
     def on_end(self, span: ReadableSpan) -> None:
-        """Called when a span is ended. Filter based on span attributes."""
-        # Safely get span name, handling None or mock objects
-        span_name = getattr(span, "name", None)
-        if span_name is None or not isinstance(span_name, str):
-            # Pass through spans without valid names (e.g., in test mocks)
-            self.wrapped_processor.on_end(span)
-            return
-
-        # Check if service bus span - always allow
-        if "servicebus.message" in span_name.lower():
-            self.wrapped_processor.on_end(span)
-            return
-
-        # Check if this is an Azure SDK span we want to suppress
-        instrumentation_scope = span.instrumentation_scope
-        if instrumentation_scope and instrumentation_scope.name:
-            # Suppress spans from Azure SDK libraries
-            if instrumentation_scope.name.startswith("azure."):
-                return  # Drop this span
-
-        # Pass through all other spans
+        scope = span.instrumentation_scope
+        if scope and scope.name:
+            # Check if it's an Azure SDK span (uses azure.core.tracing wrapper)
+            if scope.name.startswith("azure."):
+                # Allow only specific Service Bus span names
+                span_name = getattr(span, "name", "") or ""
+                if span_name in _ALLOWED_AZURE_SPAN_NAMES:
+                    self.wrapped_processor.on_end(span)
+                # Drop other Azure SDK spans
+                return
+
+        # Pass through: non-Azure SDK spans (custom traces)
         self.wrapped_processor.on_end(span)
 
     def shutdown(self) -> None:
-        """Shutdown the wrapped processor."""
         self.wrapped_processor.shutdown()
 
     def force_flush(self, timeout_millis: int = 30000) -> bool:
-        """Force flush the wrapped processor."""
         return self.wrapped_processor.force_flush(timeout_millis)
 
 
+def configure_tracing():
+    """Configure OpenTelemetry tracing with Azure Monitor exporter.
+
+    This sets up tracing for Service Bus and custom spans.
+    Other Azure SDK traces (HTTP, blob, etc.) are filtered out.
+
+    Should be called once before any tracing is performed.
+    """
+    global _TRACING_IS_CONFIGURED
+    if _TRACING_IS_CONFIGURED:
+        return
+
+    # Set up tracer provider with Azure Function resource info
+    resource = Resource.create({SERVICE_NAME: os.getenv("WEBSITE_SITE_NAME")})
+    provider = TracerProvider(
+        sampler=ALWAYS_ON,
+        resource=resource,
+    )
+    trace.set_tracer_provider(provider)
+
+    # Set up Azure Monitor trace exporter with filter
+    try:
+        trace_exporter = AzureMonitorTraceExporter()
+        span_processor = BatchSpanProcessor(trace_exporter)
+        filtered_processor = AzureSDKTraceFilter(span_processor)
+        provider.add_span_processor(filtered_processor)
+    except ValueError:
+        logger.warning(
+            "Cannot set up tracing to App Insights, as no instrumentation key is set."
+        )
+
+    _TRACING_IS_CONFIGURED = True
+
+
 @contextmanager
-def set_trace_context(trace_parent: str, span_name: str = "function_execution"):
+def set_trace_context(trace_parent: str, trace_state: str = ""):
     """Context manager for setting the trace context.
 
-    Attaches the propagated trace context and creates a child span for tracing.
-    Note: Log correlation is handled by Azure Functions' native mechanism,
-    not OpenTelemetry, so this primarily affects span/dependency tracking.
-
     Args:
-        trace_parent (str): Trace parent ID from the incoming request
-        span_name (str): Name for the span. Defaults to "function_execution".
+        trace_parent (str): Trace parent ID
+        trace_state (str, optional): Trace state. Defaults to "".
     """
-    carrier = {"traceparent": trace_parent}
+    carrier = {"traceparent": trace_parent, "tracestate": trace_state}
     ctx = TraceContextTextMapPropagator().extract(carrier=carrier)
 
     token = context.attach(ctx)
     try:
-        tracer = trace.get_tracer(__name__)
-        with tracer.start_as_current_span(span_name):
-            yield
+        yield
     finally:
         context.detach(token)
 

{warpzone_sdk-15.0.0.dev7.dist-info → warpzone_sdk-15.0.0.dev9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 15.0.0.dev7
+Version: 15.0.0.dev9
 Summary: The main objective of this package is to centralize logic used to interact with Azure Functions, Azure Service Bus and Azure Table Storage
 Author: Team Enigma
 Author-email: enigma@energinet.dk

{warpzone_sdk-15.0.0.dev7.dist-info → warpzone_sdk-15.0.0.dev9.dist-info}/RECORD

@@ -17,7 +17,7 @@ warpzone/function/__init__.py,sha256=rJOZBpWsUgjMc7YtXMJ1rLGm45KB1AhDJ_Y2ISiSISc
 warpzone/function/checks.py,sha256=B9YqThymf16ac_fVAYKilv20ru5v9nwXgHlbxYIaG98,1018
 warpzone/function/functionize.py,sha256=bSV0QvwKbD9Vo3a_8cc1rgV2rzTdMMvidinyXItBfvs,2128
 warpzone/function/integrations.py,sha256=sDt2BTx6a4mVc-33wTITP9XQVPustwj7rkX4urTyOqo,4018
-warpzone/function/monitor.py,sha256=8KKBNBvZYGZnXCt8qsQyR0-apiNZEaeFQDrsKktJp8c,3137
+warpzone/function/monitor.py,sha256=b_oc1090quhouUahmFin08XMgPNRnSQf0uGNRL08Qg0,1579
 warpzone/function/process.py,sha256=nbUVywM8ChfUwuaqFisgaD98aNRgeZkK4g5sbtuBdRs,2339
 warpzone/function/processors/__init__.py,sha256=DhIdSWLBcIeSO8IJdxPqGIhgwwnkDN6_Xqwy93BCLeA,46
 warpzone/function/processors/dependencies.py,sha256=m17BwdKyQEvzCPxpQZpAW5l1uYRIHWmweDz3XJskmpA,1259
@@ -29,7 +29,7 @@ warpzone/healthchecks/__init__.py,sha256=9gc_Mt2szs8sDSwy0V4l3JZ6d9hX41xTpZCkDP2
 warpzone/healthchecks/model.py,sha256=mM7DnrirLbUpBPPfi82MUPP654D0eOR2_F65TmzsPD0,1187
 warpzone/monitor/__init__.py,sha256=ggI5fIUu-szgC44ICzuOmpYrIoVOKPbsMT3zza9ssD4,87
 warpzone/monitor/logs.py,sha256=fabjaB5SfHynvvfp2Js3IG-owqU5jZ3lTnnmTTjD6JM,1320
-warpzone/monitor/traces.py,sha256=wYjV8LYS4ntNbMwbvLvbmZ4x4PDrY-Iv04CAKrqWPqI,3865
+warpzone/monitor/traces.py,sha256=GNDo8-EwiV1VgS8b60JVKz0MILC1K9buGS1AguZHcPY,4613
 warpzone/servicebus/data/__init__.py,sha256=lnc0uiaGLF0qMi_rWhCpRSFvaj0CJEiMCAl6Yqn1ZiA,21
 warpzone/servicebus/data/client.py,sha256=zECS3JwedhYnDk8PntYgIYpBF_uu9YN38KzpPFK7CKs,6511
 warpzone/servicebus/events/__init__.py,sha256=lnc0uiaGLF0qMi_rWhCpRSFvaj0CJEiMCAl6Yqn1ZiA,21
@@ -52,6 +52,6 @@ warpzone/tools/copy.py,sha256=5fddotMZkXZO8avzUbGOhvs0cp8mce95pNpy0oPVjnQ,2596
 warpzone/transform/__init__.py,sha256=ruGa7tl-v4ndlWpULE1jSGU_a4_iRc3V6eyNr5xKP9E,27
 warpzone/transform/data.py,sha256=Abb8PcrgMbbNCJkkIUdtrTHdlY0OfXid387qw1nDpFY,2362
 warpzone/transform/schema.py,sha256=nbSQtDMvXkyqGKuwhuFCF0WsEDsaNyoPYpMKvbsKlv8,2423
-warpzone_sdk-15.0.0.dev7.dist-info/METADATA,sha256=VCSSn6RIquWlfpcgQ99g7hxkxMgpTBxITxoItY-hQ-U,7398
-warpzone_sdk-15.0.0.dev7.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-warpzone_sdk-15.0.0.dev7.dist-info/RECORD,,
+warpzone_sdk-15.0.0.dev9.dist-info/METADATA,sha256=onn-qM-yNQeBLXK5hMVZUWosCvR0l8Lqw4gUknoZiaI,7398
+warpzone_sdk-15.0.0.dev9.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+warpzone_sdk-15.0.0.dev9.dist-info/RECORD,,