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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "warpzone-sdk"
-version = "15.0.0.dev3"
+version = "15.0.0.dev5"
 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.dev3 → warpzone_sdk-15.0.0.dev5}/warpzone/function/monitor.py

@@ -7,41 +7,29 @@ from azure.monitor.opentelemetry import configure_azure_monitor
 from opentelemetry import trace
 
 from warpzone.function.types import SingleArgumentCallable
-from warpzone.monitor import logs, traces
+from warpzone.monitor import traces
 
-# Lazy initialization flag to ensure configure_azure_monitor is called only once
-_monitor_configured = False
-
-
-def _ensure_monitor_configured():
-    """Configure Azure Monitor lazily on first use to ensure proper trace context."""
-    global _monitor_configured
-    if not _monitor_configured:
-        configure_azure_monitor()
-
-        # 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
-
-        _monitor_configured = True
+# 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()
 
+# 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>"
 
-tracer = traces.get_tracer(__name__)
-logger = logs.get_logger(__name__)
-
 
 @contextmanager
 def run_in_trace_context(context: func.Context):
     trace_context = context.trace_context
-    with traces.set_trace_context(
-        trace_context.trace_parent, trace_context.trace_state
-    ):
+    span_name = context.function_name or "azure_function"
+    with traces.set_trace_context(trace_context.trace_parent, span_name=span_name):
         yield
 
 
@@ -65,13 +53,11 @@ def monitor(main: SingleArgumentCallable) -> Callable:
     """
 
     async def wrapper_async(arg, context: func.Context):
-        _ensure_monitor_configured()
         with run_in_trace_context(context):
             result = await main(arg)
             return result
 
     def wrapper(arg, context: func.Context):
-        _ensure_monitor_configured()
         with run_in_trace_context(context):
             result = main(arg)
             return result

{warpzone_sdk-15.0.0.dev3 → warpzone_sdk-15.0.0.dev5}/warpzone/monitor/logs.py

@@ -17,8 +17,18 @@ logging.getLogger("azure.monitor.opentelemetry.exporter").setLevel(logging.WARNI
 
 
 def get_logger(name: str):
-    # set up standard logger
+    """Get a logger instance.
+
+    The logger will automatically use the current OpenTelemetry trace context
+    for correlation in Application Insights. The trace context is set by the
+    monitor decorator's run_in_trace_context context manager.
+
+    Args:
+        name: Logger name, typically __name__
+
+    Returns:
+        A configured logger instance
+    """
     logger = logging.getLogger(name)
     logger.setLevel(logging.INFO)
-
     return logger

{warpzone_sdk-15.0.0.dev3 → warpzone_sdk-15.0.0.dev5}/warpzone/monitor/traces.py

@@ -31,8 +31,15 @@ class AzureSDKTraceFilter(SpanProcessor):
 
     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():
+        if "servicebus.message" in span_name.lower():
             self.wrapped_processor.on_end(span)
             return
 
@@ -56,21 +63,27 @@ class AzureSDKTraceFilter(SpanProcessor):
 
 
 @contextmanager
-def set_trace_context(trace_parent: str, trace_state: str = ""):
-    """Context manager for setting the trace context
+def set_trace_context(trace_parent: str, span_name: str = "function_execution"):
+    """Context manager for setting the trace context with a recording span.
+
+    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.
 
     Args:
-        trace_parent (str): Trace parent ID
-        trace_state (str, optional): Trace state. Defaults to "".
+        trace_parent (str): Trace parent ID from the incoming request
+        span_name (str): Name for the span. Defaults to "function_execution".
     """
-    carrier = {"traceparent": trace_parent, "tracestate": trace_state}
+    carrier = {"traceparent": trace_parent}
     ctx = TraceContextTextMapPropagator().extract(carrier=carrier)
 
-    token = context.attach(ctx)  # attach context before run
-    try:
-        yield
-    finally:
-        context.detach(token)  # detach context after run
+    # 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):
+        with tracer.start_as_current_span(span_name):
+            yield
 
 
 def get_tracer(name: str):