warpzone-sdk 15.0.0.dev5__tar.gz → 15.0.0.dev7__tar.gz

{warpzone_sdk-15.0.0.dev5 → warpzone_sdk-15.0.0.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 15.0.0.dev5
+Version: 15.0.0.dev7
 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.dev5 → warpzone_sdk-15.0.0.dev7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "warpzone-sdk"
-version = "15.0.0.dev5"
+version = "15.0.0.dev7"
 description = "The main objective of this package is to centralize logic used to interact with Azure Functions, Azure Service Bus and Azure Table Storage"
 authors = [{ name = "Team Enigma", email = "enigma@energinet.dk" }]
 requires-python = ">=3.10"

{warpzone_sdk-15.0.0.dev5 → warpzone_sdk-15.0.0.dev7}/warpzone/function/monitor.py

@@ -1,4 +1,5 @@
 import inspect
+import threading
 from contextlib import contextmanager
 from typing import Callable
 
@@ -9,18 +10,40 @@ from opentelemetry import trace
 from warpzone.function.types import SingleArgumentCallable
 from warpzone.monitor import traces
 
-# Configure Azure Monitor at import to ensure proper telemetry setup.
-# The trace context is set per-invocation in run_in_trace_context to ensure
-# proper operation ID correlation for each function execution.
-configure_azure_monitor()
+# 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
 
-# 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"):
-    # Wrap the existing span processor with our filter
-    original_processor = tracer_provider._active_span_processor
-    filtered_processor = traces.AzureSDKTraceFilter(original_processor)
-    tracer_provider._active_span_processor = filtered_processor
 
 SUBJECT_IDENTIFIER = "<Subject>"
 
@@ -51,6 +74,8 @@ 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_sdk-15.0.0.dev5 → warpzone_sdk-15.0.0.dev7}/warpzone/monitor/traces.py

@@ -64,12 +64,11 @@ class AzureSDKTraceFilter(SpanProcessor):
 
 @contextmanager
 def set_trace_context(trace_parent: str, span_name: str = "function_execution"):
-    """Context manager for setting the trace context with a recording span.
+    """Context manager for setting the trace context.
 
-    Creates a child span of the propagated trace context. This is necessary
-    because the LoggingHandler requires a recording span to properly correlate
-    logs with the trace. A NonRecordingSpan (which is what TraceContextTextMapPropagator
-    creates) may not be correctly handled during log batching/export.
+    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
@@ -78,12 +77,13 @@ def set_trace_context(trace_parent: str, span_name: str = "function_execution"):
     carrier = {"traceparent": trace_parent}
     ctx = TraceContextTextMapPropagator().extract(carrier=carrier)
 
-    # Start a recording span as a child of the propagated context.
-    # This ensures logs are properly correlated with the trace.
-    tracer = trace.get_tracer(__name__)
-    with trace.use_span(trace.get_current_span(ctx), end_on_exit=False):
+    token = context.attach(ctx)
+    try:
+        tracer = trace.get_tracer(__name__)
         with tracer.start_as_current_span(span_name):
             yield
+    finally:
+        context.detach(token)
 
 
 def get_tracer(name: str):