warpzone-sdk 15.0.0.dev12__py3-none-any.whl → 15.0.0.dev14__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/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
@@ -27,42 +28,44 @@ _NOISY_LOGGERS = [
 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
+    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)
-    resource = Resource.create({SERVICE_NAME: os.getenv("WEBSITE_SITE_NAME")})
-    logs.set_logger_provider(
-        LoggerProvider(
-            resource=resource,
+        # 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,
+            )
         )
-    )
 
-    # 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)
+        # 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
+        LOGGING_IS_CONFIGURED = True
 
 
 def get_logger(name: str):
@@ -77,5 +80,7 @@ def get_logger(name: str):
         # 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,5 +1,6 @@
 import logging
 import os
+import threading
 from contextlib import contextmanager
 from logging import StreamHandler
 
@@ -16,46 +17,48 @@ 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,
+    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)
-
-    TRACING_IS_CONFIGURED = True
+        # 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
 
 
 @contextmanager

warpzone/tablestorage/db/client.py

@@ -160,31 +160,22 @@ class WarpzoneDatabaseClient:
         filters: Optional[dict[str, object]] = None,
         use_cache: Optional[bool] = True,
     ) -> pd.DataFrame:
-        with tracer.start_as_current_span(
-            "WarpzoneDatabaseClient.query",
-            attributes={
-                "table_name": table_name,
-                "use_cache": use_cache,
-                "has_filters": filters is not None,
-                "has_time_interval": time_interval is not None,
-            },
-        ):
-            table_metadata = self.get_table_metadata(table_name)
-
-            match table_metadata.data_type:
-                case DataType.TIME_SERIES:
-                    df = self._query_time_series(
-                        table_metadata, time_interval, filters, use_cache
+        table_metadata = self.get_table_metadata(table_name)
+
+        match table_metadata.data_type:
+            case DataType.TIME_SERIES:
+                df = self._query_time_series(
+                    table_metadata, time_interval, filters, use_cache
+                )
+            case _:
+                if time_interval:
+                    raise ValueError(
+                        f"Table {table_name} is not a time series table,"
+                        " and cannot be queried with a time interval."
                     )
-                case _:
-                    if time_interval:
-                        raise ValueError(
-                            f"Table {table_name} is not a time series table,"
-                            " and cannot be queried with a time interval."
-                        )
-                    df = self._query_generic(table_metadata, None, filters, use_cache)
-
-            return df
+                df = self._query_generic(table_metadata, None, filters, use_cache)
+
+        return df
 
     def list_tables(self):
         return self._table_client.list_tables()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: warpzone-sdk
-Version: 15.0.0.dev12
+Version: 15.0.0.dev14
 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.dev12.dist-info → warpzone_sdk-15.0.0.dev14.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=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
@@ -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=gXT2cxR4tlZER54zd7D49ZQBVyitLaqj13_cUoILuyM,109
-warpzone/monitor/logs.py,sha256=iYGDsaATq6iqcEK4tWDssgw66rkd3gsnNECZmJ8mbME,2889
-warpzone/monitor/traces.py,sha256=ARd8IW1BqCRgOXu-A_guOAOGpGvpKhJRTzjJgbAgx5Y,3994
+warpzone/monitor/logs.py,sha256=AO853uEpD9ZZldQsBic5IR9k3GuQPyWafk4pC5fAGio,3084
+warpzone/monitor/traces.py,sha256=2ANxKmO1yca3JFBi68P9HeXQo8WVOOVeT1ev3GLURSY,4107
 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
@@ -37,7 +37,7 @@ warpzone/servicebus/events/client.py,sha256=8v8XsF-2RwzKIi_93IzR_eR-BZTGXXHSuV4P
 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
-warpzone/tablestorage/db/client.py,sha256=w8p3ghtpFnbDQtqqAQTFnC346lLDjBKmi3rRjNgSrz0,7053
+warpzone/tablestorage/db/client.py,sha256=5I_5pUzB9ZVYyj8cf2g9PIuMdXIfaytWsAnDm6EZnyg,6661
 warpzone/tablestorage/db/table_config.py,sha256=PC45dnr3vVMVr8ktu3GWoH8u3JKJaCRAvMCroUaC1NE,1336
 warpzone/tablestorage/tables/__init__.py,sha256=l_8wElG1oam39fmXqIXDAnCYqbKXEyX1G0cD6JCCv4s,78
 warpzone/tablestorage/tables/client.py,sha256=chvmTz5S8M1-IWYgfJHyTCwLZVsVzlchMuCYwHzQhCE,3636
@@ -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.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,,
+warpzone_sdk-15.0.0.dev14.dist-info/METADATA,sha256=C7hvF9-5FlHq-EwoLv65npYpGLZTIEXAsRXo_0Sp_GE,7285
+warpzone_sdk-15.0.0.dev14.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+warpzone_sdk-15.0.0.dev14.dist-info/RECORD,,