warpzone-sdk 15.0.0.dev3__py3-none-any.whl → 15.0.0.dev4__py3-none-any.whl

warpzone/function/monitor.py

@@ -7,41 +7,28 @@ 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
-    ):
+    with traces.set_trace_context(trace_context.trace_parent):
         yield
 
 
@@ -65,13 +52,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/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/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):

{warpzone_sdk-15.0.0.dev3.dist-info → warpzone_sdk-15.0.0.dev4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 15.0.0.dev3
+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.dev3.dist-info → warpzone_sdk-15.0.0.dev4.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=gGWoxrOTaXofds8FJwPwGf58q0XV19Xwj9VRzhr0GM8,2594
+warpzone/function/monitor.py,sha256=qBvnSTSX--6_6qccTZrGPO1iS5nz2tNZlHdhE1XBrbs,2214
 warpzone/function/process.py,sha256=nbUVywM8ChfUwuaqFisgaD98aNRgeZkK4g5sbtuBdRs,2339
 warpzone/function/processors/__init__.py,sha256=DhIdSWLBcIeSO8IJdxPqGIhgwwnkDN6_Xqwy93BCLeA,46
 warpzone/function/processors/dependencies.py,sha256=m17BwdKyQEvzCPxpQZpAW5l1uYRIHWmweDz3XJskmpA,1259
@@ -28,8 +28,8 @@ warpzone/function/types.py,sha256=5m2hRrnLC3eqIlAH5-MM9_wKjMZ6lYawZtCOVStyFuY,72
 warpzone/healthchecks/__init__.py,sha256=9gc_Mt2szs8sDSwy0V4l3JZ6d9hX41xTpZCkDP2qsY4,2108
 warpzone/healthchecks/model.py,sha256=mM7DnrirLbUpBPPfi82MUPP654D0eOR2_F65TmzsPD0,1187
 warpzone/monitor/__init__.py,sha256=ggI5fIUu-szgC44ICzuOmpYrIoVOKPbsMT3zza9ssD4,87
-warpzone/monitor/logs.py,sha256=V1A2ImqbPo4c-hDr2qWAZlpr2muyVar30eI9mF2_rzE,986
-warpzone/monitor/traces.py,sha256=PhhYeZlPc7EOSq9KVsHdKOwEIivDHCV-RwZnDNVL7ic,3244
+warpzone/monitor/logs.py,sha256=fabjaB5SfHynvvfp2Js3IG-owqU5jZ3lTnnmTTjD6JM,1320
+warpzone/monitor/traces.py,sha256=B_1_fmUNUwHRKB-IYfhWSw5VRluVvn1NQqSYTqNV0wA,4158
 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.dev3.dist-info/METADATA,sha256=SbdclS53SblY02qVWfnpicAHmSQJXPqKIfz_gAxtaRM,7398
-warpzone_sdk-15.0.0.dev3.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-warpzone_sdk-15.0.0.dev3.dist-info/RECORD,,
+warpzone_sdk-15.0.0.dev4.dist-info/METADATA,sha256=jxPQ1HTdmdO0ePXvZAFg58OmIGw38qssEwnc6o9eTAI,7398
+warpzone_sdk-15.0.0.dev4.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+warpzone_sdk-15.0.0.dev4.dist-info/RECORD,,