warpzone-sdk 14.3.0__py3-none-any.whl → 15.0.0__py3-none-any.whl

warpzone/function/monitor.py

@@ -1,5 +1,4 @@
 import asyncio
-import logging
 from contextlib import contextmanager
 from typing import Callable
 
@@ -18,16 +17,7 @@ def configure_monitoring():
     """
     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()
 

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,6 +1,7 @@
 # NOTE: OpenTelemetry logging to Azure is still in EXPERIMENTAL mode!
 import logging
 import os
+import threading
 from logging import StreamHandler
 
 from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter
@@ -12,42 +13,60 @@ from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 logger = logging.getLogger(__name__)
 logger.addHandler(StreamHandler())
 
+# 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_LOCK = threading.Lock()
 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,
-        )
-    )
-
-    # 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."
+    # Add thread locking to avoid race conditions during setup
+    with _LOGGING_LOCK:
+        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)
+        service_name = os.getenv("WEBSITE_SITE_NAME") or "unknown-service"
+        resource = Resource.create({SERVICE_NAME: service_name})
+        logs.set_logger_provider(
+            LoggerProvider(
+                resource=resource,
+            )
         )
-    else:
-        log_record_processor = BatchLogRecordProcessor(log_exporter)
-        logs.get_logger_provider().add_log_record_processor(log_record_processor)
 
-    LOGGING_IS_CONFIGURED = True
+        # setup azure monitor log exporter to send telemetry to App Insights
+        try:
+            log_exporter = AzureMonitorLogExporter()
+        except ValueError:
+            logger.warning(
+                "Cant set up logging to App Insights,"
+                " as no connection string is set."
+            )
+        else:
+            log_record_processor = BatchLogRecordProcessor(log_exporter)
+            logs.get_logger_provider().add_log_record_processor(log_record_processor)
+
+        LOGGING_IS_CONFIGURED = True
 
 
 def get_logger(name: str):
@@ -55,9 +74,14 @@ def get_logger(name: str):
     logger = logging.getLogger(name)
     logger.setLevel(logging.INFO)
 
-    if not logger.hasHandlers():
-        # add OTEL handler
+    # 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)
+        # Don't propagate to root logger to avoid duplicate logs
+        logger.propagate = False
 
     return logger

warpzone/monitor/traces.py

@@ -1,10 +1,10 @@
 import logging
 import os
+import threading
 from contextlib import contextmanager
 from logging import StreamHandler
 
 from azure.monitor.opentelemetry.exporter import AzureMonitorTraceExporter
-from azure.servicebus._common import constants
 from opentelemetry import context, trace
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
@@ -17,46 +17,49 @@ logger.addHandler(StreamHandler())
 
 tracer = trace.get_tracer(__name__)
 
+_TRACING_LOCK = threading.Lock()
 TRACING_IS_CONFIGURED = False
 
 
 def configure_tracing():
     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 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")})
-    trace.set_tracer_provider(
-        TracerProvider(
-            sampler=ALWAYS_ON,
-            resource=resource,
+    # Add thread locking to avoid race conditions during setup
+    with _TRACING_LOCK:
+        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 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)
+        service_name = os.getenv("WEBSITE_SITE_NAME") or "unknown-service"
+        resource = Resource.create({SERVICE_NAME: service_name})
+        trace.set_tracer_provider(
+            TracerProvider(
+                sampler=ALWAYS_ON,
+                resource=resource,
+            )
         )
-    )
 
-    # setup azure monitor trace exporter to send telemetry to App Insights
-    try:
-        trace_exporter = AzureMonitorTraceExporter()
-    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 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)
+        # setup azure monitor trace exporter to send telemetry to App Insights
+        try:
+            trace_exporter = AzureMonitorTraceExporter()
+        except ValueError:
+            logger.warning(
+                "Cant set up tracing to App Insights,"
+                " as no connection string 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
@@ -103,34 +106,23 @@ def get_current_diagnostic_id() -> str:
     return diagnostic_id
 
 
+# Service Bus trace constants (these were removed from azure-servicebus SDK)
+_SB_TRACE_NAMESPACE = "Microsoft.ServiceBus"
+
+
 @contextmanager
-def servicebus_send_span(servicebus_url: str, topic_name: str) -> trace.Span:
-    """Start spans necessary for correct tracing
+def servicebus_send_span(subject: str) -> trace.Span:
+    """Start span for Service Bus message tracing.
 
     Args:
-        servicebus_url (str): The full servicebus url
-        topic_name (str): Name of topic
+        subject: The message subject (used as span name for easy identification)
 
     Yields:
-        trace.Span: the inner span
+        trace.Span: the span
     """
     with tracer.start_as_current_span(
-        constants.SPAN_NAME_SEND, kind=trace.SpanKind.CLIENT
-    ) as send_span:
-        send_span.set_attributes(
-            {
-                constants.TRACE_COMPONENT_PROPERTY: constants.TRACE_NAMESPACE,
-                constants.TRACE_NAMESPACE_PROPERTY: constants.TRACE_NAMESPACE_PROPERTY,
-                constants.TRACE_BUS_DESTINATION_PROPERTY: topic_name,
-                constants.TRACE_PEER_ADDRESS_PROPERTY: servicebus_url,
-            }
-        )
-
-        with tracer.start_as_current_span(
-            constants.SPAN_NAME_MESSAGE, kind=trace.SpanKind.PRODUCER
-        ) as msg_span:
-            msg_span.set_attributes(
-                {constants.TRACE_NAMESPACE_PROPERTY: constants.TRACE_NAMESPACE}
-            )
+        subject, kind=trace.SpanKind.PRODUCER
+    ) as msg_span:
+        msg_span.set_attributes({"az.namespace": _SB_TRACE_NAMESPACE})
 
-            yield msg_span
+        yield msg_span

warpzone/servicebus/events/client.py

@@ -56,9 +56,9 @@ class WarpzoneEventClient:
     def from_resource_name(
         cls,
         service_bus_namespace: str,
-        credential: AzureNamedKeyCredential
-        | AzureSasCredential
-        | TokenCredential = DefaultAzureCredential(),
+        credential: (
+            AzureNamedKeyCredential | AzureSasCredential | TokenCredential
+        ) = DefaultAzureCredential(),
     ):
         service_bus_client = ServiceBusClient(
             fully_qualified_namespace=f"{service_bus_namespace}.servicebus.windows.net",
@@ -125,9 +125,7 @@ class WarpzoneEventClient:
     ):
         typeguard.check_type(value=topic, expected_type=Topic)
         topic_name = topic.value
-        with traces.servicebus_send_span(
-            self._service_bus_client.fully_qualified_namespace, topic_name
-        ):
+        with traces.servicebus_send_span(event_msg.subject):
             diagnostic_id = traces.get_current_diagnostic_id()
 
             az_sdk_msg = ServiceBusMessage(

{warpzone_sdk-14.3.0.dist-info → warpzone_sdk-15.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 14.3.0
+Version: 15.0.0
 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,12 +13,11 @@ 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-exporter (>=1.0.0b36)
-Requires-Dist: azure-servicebus (>=7.8.0,<7.9.0)
+Requires-Dist: azure-servicebus (>=7.8.0)
 Requires-Dist: azure-storage-blob (>=12.14.1)
 Requires-Dist: cryptography (==43.0.3)
 Requires-Dist: datamazing (>=5.1.6)

{warpzone_sdk-14.3.0.dist-info → warpzone_sdk-15.0.0.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=Law-0TI_tbm8rq5XXuilDH69_0LhoqaZhDbTL498Qik,4016
-warpzone/function/monitor.py,sha256=szPn6jYfWcdypZVjqy3Md7SKpKoZ979PZ8px4PFIm5U,2223
+warpzone/function/monitor.py,sha256=xD13d4795a9qgGphOywFl4sOXRQjKypiL2ozQFOseqQ,1862
 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=pdAGKF0VFhYBHzx7OXxn2dnweZUbrkL4wUKD-tP88TE,2204
-warpzone/monitor/traces.py,sha256=ISeZ72-XZH0u9alTbLPWXzAB_R3NGa9JiuU1YOzEm4w,4555
+warpzone/monitor/__init__.py,sha256=gXT2cxR4tlZER54zd7D49ZQBVyitLaqj13_cUoILuyM,109
+warpzone/monitor/logs.py,sha256=q3SUQCtG1ii0B9GkVs2l8kgZ5b5bI2qI6L0SoOW2QTY,3147
+warpzone/monitor/traces.py,sha256=Xc_po1LxJFy5jtNWxIVphIInl_d89Zw3Rb21PsdQhQA,4170
 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=fv4-X5VJe_Cje3_aPgg-6J_I4tt4_sw9rKdeAsfHgMQ,5640
+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-14.3.0.dist-info/METADATA,sha256=H_nmtqjNnYFbsLo5tX7zmCzD0f0f5O8eSwBlKBueGHg,7347
-warpzone_sdk-14.3.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-warpzone_sdk-14.3.0.dist-info/RECORD,,
+warpzone_sdk-15.0.0.dist-info/METADATA,sha256=nRDec8CvHZR0OJLG-LNJWCxQVPSqmLDfZuw_NlWkzGk,7279
+warpzone_sdk-15.0.0.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+warpzone_sdk-15.0.0.dist-info/RECORD,,