warpzone-sdk 15.0.0.dev2__tar.gz → 15.0.0.dev4__tar.gz

{warpzone_sdk-15.0.0.dev2 → warpzone_sdk-15.0.0.dev4}/PKG-INFO

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

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

@@ -7,9 +7,11 @@ 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
 
-# Configure Azure Monitor first
+# 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
@@ -22,16 +24,11 @@ if hasattr(tracer_provider, "_active_span_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
-    ):
+    with traces.set_trace_context(trace_context.trace_parent):
         yield
 
 

{warpzone_sdk-15.0.0.dev2 → warpzone_sdk-15.0.0.dev4}/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.dev2 → warpzone_sdk-15.0.0.dev4}/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,36 @@ 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):
+    """Context manager for setting the trace context.
+
+    Attaches the propagated trace context with a NonRecordingSpan so that
+    logs emitted within this context are properly correlated with the trace
+    created by Azure Functions.
+
+    The NonRecordingSpan is necessary because the LoggingHandler needs an
+    actual span (not just a SpanContext) to extract trace correlation IDs.
+    Using NonRecordingSpan avoids creating duplicate spans while still
+    providing the trace_id and span_id for log correlation.
 
     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
     """
-    carrier = {"traceparent": trace_parent, "tracestate": trace_state}
+    carrier = {"traceparent": trace_parent}
     ctx = TraceContextTextMapPropagator().extract(carrier=carrier)
 
-    token = context.attach(ctx)  # attach context before run
+    # Get the span from the extracted context - this is a NonRecordingSpan
+    # created by the propagator with the correct trace_id and span_id
+    span = trace.get_current_span(ctx)
+
+    # Set this span as the current span in context
+    ctx = trace.set_span_in_context(span)
+
+    token = context.attach(ctx)
     try:
         yield
     finally:
-        context.detach(token)  # detach context after run
+        context.detach(token)
 
 
 def get_tracer(name: str):