warpzone-sdk 15.0.0.dev10__py3-none-any.whl → 15.0.0.dev12__py3-none-any.whl

warpzone/function/monitor.py

@@ -1,29 +1,43 @@
-import inspect
+import asyncio
+import logging
 from contextlib import contextmanager
 from typing import Callable
 
 import azure.functions as func
 
 from warpzone.function.types import SingleArgumentCallable
-from warpzone.monitor import traces
-
-# Configure tracing at import time (once per worker process)
-traces.configure_tracing()
+from warpzone.monitor import logs, traces
 
 SUBJECT_IDENTIFIER = "<Subject>"
 
+tracer = traces.get_tracer(__name__)
+logger = logs.get_logger(__name__)
 
-@contextmanager
-def run_in_trace_context(context: func.Context):
-    """Set up trace context and ensure log correlation for this function invocation.
 
-    This sets:
-    1. OpenTelemetry trace context (for distributed tracing via Service Bus)
-    2. Azure Functions invocation_id in thread-local storage (for log correlation)
+def configure_monitoring():
     """
-    # Ensure Azure Functions' log correlation uses this invocation's ID
-    # This prevents log leakage when multiple functions run concurrently
-    context.thread_local_storage.invocation_id = context.invocation_id
+    Configure logging and tracing on Azure Function to
+    - export telemetry to App Insights
+    - suppress spamming logs
+    """
+    # disable logging for HTTP calls to avoid log spamming
+    logging.getLogger("azure.core.pipeline.policies.http_logging_policy").setLevel(
+        logging.WARNING
+    )
+
+    # disable logging for Service Bus underlying uAMQP library to avoid log spamming
+    logging.getLogger("uamqp").setLevel(logging.WARNING)
+
+    # configure tracer provider
+    traces.configure_tracing()
+
+    # configure logger provider
+    logs.configure_logging()
+
+
+@contextmanager
+def run_in_trace_context(context: func.Context):
+    configure_monitoring()
 
     trace_context = context.trace_context
     with traces.set_trace_context(
@@ -61,7 +75,7 @@ def monitor(main: SingleArgumentCallable) -> Callable:
             result = main(arg)
             return result
 
-    if inspect.iscoroutinefunction(main):
+    if asyncio.iscoroutinefunction(main):
         return wrapper_async
     else:
         return wrapper

warpzone/monitor/__init__.py

@@ -1,2 +1,2 @@
 from .logs import get_logger
-from .traces import get_current_diagnostic_id, get_tracer
+from .traces import get_current_diagnostic_id, get_tracer, servicebus_send_span

warpzone/monitor/logs.py

@@ -1,33 +1,81 @@
+# NOTE: OpenTelemetry logging to Azure is still in EXPERIMENTAL mode!
 import logging
+import os
+from logging import StreamHandler
 
-# Suppress verbose logging from Azure SDK
-logging.getLogger("azure.core.pipeline.policies.http_logging_policy").setLevel(
-    logging.WARNING
-)
-logging.getLogger("azure.data.tables").setLevel(logging.WARNING)
-logging.getLogger("azure.storage.blob").setLevel(logging.WARNING)
-logging.getLogger("azure.servicebus").setLevel(logging.WARNING)
-logging.getLogger("uamqp").setLevel(logging.WARNING)
-logging.getLogger("azure.identity").setLevel(logging.WARNING)
-# Suppress Azure Functions host/worker logging (e.g., trigger details)
-logging.getLogger("azure_functions_worker").setLevel(logging.WARNING)
-logging.getLogger("azure.functions").setLevel(logging.WARNING)
-# Suppress Azure Monitor exporter logging (e.g., transmission success messages)
-logging.getLogger("azure.monitor.opentelemetry.exporter").setLevel(logging.WARNING)
+from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter
+from opentelemetry import _logs as logs
+from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
+from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 
+logger = logging.getLogger(__name__)
+logger.addHandler(StreamHandler())
 
-def get_logger(name: str):
-    """Get a logger instance.
+# Suppress verbose logging from Azure SDK and infrastructure
+_NOISY_LOGGERS = [
+    "azure.core.pipeline.policies.http_logging_policy",
+    "azure.data.tables",
+    "azure.storage.blob",
+    "azure.servicebus",
+    "azure.identity",
+    "azure.monitor.opentelemetry.exporter",
+    "azure_functions_worker",
+    "azure.functions",
+    "uamqp",
+]
+for _logger_name in _NOISY_LOGGERS:
+    logging.getLogger(_logger_name).setLevel(logging.WARNING)
+
+LOGGING_IS_CONFIGURED = False
+
+
+def configure_logging():
+    global LOGGING_IS_CONFIGURED
+    if LOGGING_IS_CONFIGURED:
+        # logging should only be set up once
+        # to avoid duplicated log handling.
+        # Global variables is the pattern used
+        # by opentelemetry, so we use the same
+        return
+
+    # set up logger provider based on the Azure Function resource
+    # (this is make sure App Insights can track the log source correctly)
+    # (https://learn.microsoft.com/en-us/azure/azure-monitor/app/opentelemetry-enable?tabs=net#set-the-cloud-role-name-and-the-cloud-role-instance)
+    resource = Resource.create({SERVICE_NAME: os.getenv("WEBSITE_SITE_NAME")})
+    logs.set_logger_provider(
+        LoggerProvider(
+            resource=resource,
+        )
+    )
 
-    Logs are correlated with the correct function invocation via Azure Functions'
-    thread-local storage invocation_id, which is set by the monitor decorator.
+    # setup azure monitor log exporter to send telemetry to App Insights
+    try:
+        log_exporter = AzureMonitorLogExporter()
+    except ValueError:
+        # if no App Insights instrumentation key is set (e.g. when running unit tests),
+        # the exporter creation will fail. In this case we skip it
+        logger.warning(
+            "Cant set up logging to App Insights, as no instrumentation key is set."
+        )
+    else:
+        log_record_processor = BatchLogRecordProcessor(log_exporter)
+        logs.get_logger_provider().add_log_record_processor(log_record_processor)
 
-    Args:
-        name: Logger name, typically __name__
+    LOGGING_IS_CONFIGURED = True
 
-    Returns:
-        A configured logger instance
-    """
+
+def get_logger(name: str):
+    # set up standard logger
     logger = logging.getLogger(name)
     logger.setLevel(logging.INFO)
+
+    # Check if OTEL handler is already added to this specific logger
+    # (not using hasHandlers() as it also checks parent/root handlers)
+    has_otel_handler = any(isinstance(h, LoggingHandler) for h in logger.handlers)
+    if not has_otel_handler:
+        # add OTEL handler for trace correlation
+        handler = LoggingHandler()
+        logger.addHandler(handler)
+
     return logger

warpzone/monitor/traces.py

@@ -1,106 +1,66 @@
 import logging
 import os
 from contextlib import contextmanager
+from logging import StreamHandler
 
-from azure.core.settings import settings
 from azure.monitor.opentelemetry.exporter import AzureMonitorTraceExporter
 from opentelemetry import context, trace
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
-from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor, TracerProvider
+from opentelemetry.sdk.trace import 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__)
+logger.addHandler(StreamHandler())
 
-_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):
-    """SpanProcessor that filters out noisy Azure SDK traces.
-
-    Allows:
-    - All non-Azure SDK spans (custom/user traces)
-    - Service Bus spans (for tracing function chains)
-
-    Drops:
-    - Other Azure SDK spans (HTTP client, blob storage, etc.)
-    """
-
-    def __init__(self, wrapped_processor: SpanProcessor):
-        self.wrapped_processor = wrapped_processor
-
-    def on_start(
-        self, span: ReadableSpan, parent_context: context.Context = None
-    ) -> None:
-        self.wrapped_processor.on_start(span, parent_context)
-
-    def on_end(self, span: ReadableSpan) -> None:
-        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)
+tracer = trace.get_tracer(__name__)
 
-    def shutdown(self) -> None:
-        self.wrapped_processor.shutdown()
-
-    def force_flush(self, timeout_millis: int = 30000) -> bool:
-        return self.wrapped_processor.force_flush(timeout_millis)
+TRACING_IS_CONFIGURED = False
 
 
 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:
+    global TRACING_IS_CONFIGURED
+    if TRACING_IS_CONFIGURED:
+        # tracing should only be set up once
+        # to avoid duplicated trace handling.
+        # Global variables is the pattern used
+        # by opentelemetry, so we use the same
         return
 
-    # Set up tracer provider with Azure Function resource info
+    # set up tracer provider based on the Azure Function resource
+    # (this is make sure App Insights can track the trace source correctly)
+    # (https://learn.microsoft.com/en-us/azure/azure-monitor/app/opentelemetry-enable?tabs=net#set-the-cloud-role-name-and-the-cloud-role-instance).
+    # We use the ALWAYS ON sampler since otherwise spans will not be
+    # recording upon creation
+    # (https://anecdotes.dev/opentelemetry-on-google-cloud-unraveling-the-mystery-f61f044c18be)
     resource = Resource.create({SERVICE_NAME: os.getenv("WEBSITE_SITE_NAME")})
-    provider = TracerProvider(
-        sampler=ALWAYS_ON,
-        resource=resource,
+    trace.set_tracer_provider(
+        TracerProvider(
+            sampler=ALWAYS_ON,
+            resource=resource,
+        )
     )
-    trace.set_tracer_provider(provider)
 
-    # Set up Azure Monitor trace exporter with filter
+    # setup azure monitor trace exporter to send telemetry to App Insights
     try:
         trace_exporter = AzureMonitorTraceExporter()
-        span_processor = BatchSpanProcessor(trace_exporter)
-        filtered_processor = AzureSDKTraceFilter(span_processor)
-        provider.add_span_processor(filtered_processor)
     except ValueError:
+        # if no App Insights instrumentation key is set (e.g. when running unit tests),
+        # the exporter creation will fail. In this case we skip it
         logger.warning(
-            "Cannot set up tracing to App Insights, as no instrumentation key is set."
+            "Cant set up tracing to App Insights, as no instrumentation key is set."
         )
+    else:
+        span_processor = BatchSpanProcessor(trace_exporter)
+        trace.get_tracer_provider().add_span_processor(span_processor)
 
-    _TRACING_IS_CONFIGURED = True
+    TRACING_IS_CONFIGURED = True
 
 
 @contextmanager
 def set_trace_context(trace_parent: str, trace_state: str = ""):
-    """Context manager for setting the trace context.
+    """Context manager for setting the trace context
 
     Args:
         trace_parent (str): Trace parent ID
@@ -109,11 +69,11 @@ def set_trace_context(trace_parent: str, trace_state: str = ""):
     carrier = {"traceparent": trace_parent, "tracestate": trace_state}
     ctx = TraceContextTextMapPropagator().extract(carrier=carrier)
 
-    token = context.attach(ctx)
+    token = context.attach(ctx)  # attach context before run
     try:
         yield
     finally:
-        context.detach(token)
+        context.detach(token)  # detach context after run
 
 
 def get_tracer(name: str):
@@ -140,3 +100,25 @@ def get_current_diagnostic_id() -> str:
     diagnostic_id = f"00-{operation_id}-{parent_id}-01"
 
     return diagnostic_id
+
+
+# Service Bus trace constants (these were removed from azure-servicebus SDK)
+_SB_TRACE_NAMESPACE = "Microsoft.ServiceBus"
+
+
+@contextmanager
+def servicebus_send_span(subject: str) -> trace.Span:
+    """Start span for Service Bus message tracing.
+
+    Args:
+        subject: The message subject (used as span name for easy identification)
+
+    Yields:
+        trace.Span: the span
+    """
+    with tracer.start_as_current_span(
+        subject, kind=trace.SpanKind.PRODUCER
+    ) as msg_span:
+        msg_span.set_attributes({"az.namespace": _SB_TRACE_NAMESPACE})
+
+        yield msg_span

warpzone/servicebus/events/client.py

@@ -125,20 +125,20 @@ class WarpzoneEventClient:
     ):
         typeguard.check_type(value=topic, expected_type=Topic)
         topic_name = topic.value
+        with traces.servicebus_send_span(event_msg.subject):
+            diagnostic_id = traces.get_current_diagnostic_id()
+
+            az_sdk_msg = ServiceBusMessage(
+                body=json.dumps(event_msg.event),
+                subject=event_msg.subject,
+                content_type="application/json",
+                message_id=event_msg.message_id,
+                application_properties={"Diagnostic-Id": diagnostic_id},
+                time_to_live=event_msg.time_to_live,
+            )
 
-        diagnostic_id = traces.get_current_diagnostic_id()
-
-        az_sdk_msg = ServiceBusMessage(
-            body=json.dumps(event_msg.event),
-            subject=event_msg.subject,
-            content_type="application/json",
-            message_id=event_msg.message_id,
-            application_properties={"Diagnostic-Id": diagnostic_id},
-            time_to_live=event_msg.time_to_live,
-        )
-
-        with self._get_topic_sender(topic_name) as sender:
-            sender.send_messages(message=az_sdk_msg)
+            with self._get_topic_sender(topic_name) as sender:
+                sender.send_messages(message=az_sdk_msg)
 
     def list_subscriptions(
         self,

{warpzone_sdk-15.0.0.dev10.dist-info → warpzone_sdk-15.0.0.dev12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 15.0.0.dev10
+Version: 15.0.0.dev12
 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
@@ -13,11 +13,9 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: aiohttp (>=3.8.3)
 Requires-Dist: azure-core (>=1.26.3)
-Requires-Dist: azure-core-tracing-opentelemetry (>=1.0.0b12)
 Requires-Dist: azure-data-tables (>=12.4.0)
 Requires-Dist: azure-functions (>=1.12.0)
 Requires-Dist: azure-identity (>=1.15.0)
-Requires-Dist: azure-monitor-opentelemetry (>=1.8.4)
 Requires-Dist: azure-monitor-opentelemetry-exporter (>=1.0.0b36)
 Requires-Dist: azure-servicebus (>=7.8.0)
 Requires-Dist: azure-storage-blob (>=12.14.1)

{warpzone_sdk-15.0.0.dev10.dist-info → warpzone_sdk-15.0.0.dev12.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=7GySRig9mI-BtGHm_l5anhmICNjOybgR3MrVhht1ZY8,2065
+warpzone/function/monitor.py,sha256=szPn6jYfWcdypZVjqy3Md7SKpKoZ979PZ8px4PFIm5U,2223
 warpzone/function/process.py,sha256=nbUVywM8ChfUwuaqFisgaD98aNRgeZkK4g5sbtuBdRs,2339
 warpzone/function/processors/__init__.py,sha256=DhIdSWLBcIeSO8IJdxPqGIhgwwnkDN6_Xqwy93BCLeA,46
 warpzone/function/processors/dependencies.py,sha256=m17BwdKyQEvzCPxpQZpAW5l1uYRIHWmweDz3XJskmpA,1259
@@ -27,13 +27,13 @@ warpzone/function/signature.py,sha256=_ZFDp9wAsSXtha05V5WPNeohwJ3JFh_OADB05FaOQa
 warpzone/function/types.py,sha256=5m2hRrnLC3eqIlAH5-MM9_wKjMZ6lYawZtCOVStyFuY,724
 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=4TSf5zjkLL1L6SehVxya7mjF54E3hhlnmFSB5Sk1DEc,1264
-warpzone/monitor/traces.py,sha256=GNDo8-EwiV1VgS8b60JVKz0MILC1K9buGS1AguZHcPY,4613
+warpzone/monitor/__init__.py,sha256=gXT2cxR4tlZER54zd7D49ZQBVyitLaqj13_cUoILuyM,109
+warpzone/monitor/logs.py,sha256=iYGDsaATq6iqcEK4tWDssgw66rkd3gsnNECZmJ8mbME,2889
+warpzone/monitor/traces.py,sha256=ARd8IW1BqCRgOXu-A_guOAOGpGvpKhJRTzjJgbAgx5Y,3994
 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
-warpzone/servicebus/events/client.py,sha256=jv7QXlTc6Ye2PDVWJC3H0zBFtYWlybBoRj2Ssu5-6rw,5477
+warpzone/servicebus/events/client.py,sha256=8v8XsF-2RwzKIi_93IzR_eR-BZTGXXHSuV4P9WCQ3_4,5581
 warpzone/servicebus/events/triggers.py,sha256=_QuPTBbje7LrBoz0qhhgrtDZOcE6x1S9GNu-WJUQ8bY,2626
 warpzone/tablestorage/db/__init__.py,sha256=lnc0uiaGLF0qMi_rWhCpRSFvaj0CJEiMCAl6Yqn1ZiA,21
 warpzone/tablestorage/db/base_client.py,sha256=ropKO6z0UXqBl38NuGYV4VZ_ZFm4w1d84ReOLYoBKLY,2376
@@ -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.dev10.dist-info/METADATA,sha256=ZkvvLVc9pluIMkBrCfkiEVw91YXE2_hFsrq0lF4C0YU,7399
-warpzone_sdk-15.0.0.dev10.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-warpzone_sdk-15.0.0.dev10.dist-info/RECORD,,
+warpzone_sdk-15.0.0.dev12.dist-info/METADATA,sha256=C1StbO7xo2v1z8MHH_Xx-SLcYS9iw-jkSamfRPr2MxY,7285
+warpzone_sdk-15.0.0.dev12.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+warpzone_sdk-15.0.0.dev12.dist-info/RECORD,,