Merge branch 'master' into ESS-3438-3_11to_3_13

Author: bjorn-einar-bjartnes-4ss

datareservoirio/_logging.py

@@ -1,25 +1,30 @@
 import logging
 import os
-from functools import wraps
+from functools import cache, wraps
 
-from opencensus.ext.azure.log_exporter import AzureLogHandler
+from azure.monitor.opentelemetry import configure_azure_monitor
 
 import datareservoirio as drio
 
 from ._constants import ENV_VAR_ENABLE_APP_INSIGHTS, ENV_VAR_ENGINE_ROOM_APP_ID
 from .globalsettings import environment
 
-exceptions_logger = logging.getLogger(__name__ + "_exception_logger")
-exceptions_logger.setLevel(logging.DEBUG)
 
-if os.getenv(ENV_VAR_ENABLE_APP_INSIGHTS) is not None:
-    enable_app_insights = os.environ[ENV_VAR_ENABLE_APP_INSIGHTS].lower()
-    if enable_app_insights == "true" or enable_app_insights == "1":
-        app_insight_handler = AzureLogHandler(
-            connection_string=environment._application_insight_connectionstring
-        )
-        app_insight_handler.setLevel("WARNING")
-        exceptions_logger.addHandler(app_insight_handler)
+@cache
+def get_exceptions_logger() -> logging.Logger:
+    exceptions_logger = logging.getLogger(__name__ + "_exception_logger")
+    exceptions_logger.setLevel(logging.DEBUG)
+
+    if os.getenv(ENV_VAR_ENABLE_APP_INSIGHTS) is not None:
+        enable_app_insights = os.environ[ENV_VAR_ENABLE_APP_INSIGHTS].lower()
+        if enable_app_insights == "true" or enable_app_insights == "1":
+            configure_azure_monitor(
+                connection_string=environment._application_insight_connectionstring,
+                logger_name=__name__ + "_exceptions_logger",
+            )
+            exceptions_logger.setLevel("WARNING")
+
+    return exceptions_logger
 
 
 def log_decorator(log_level):
@@ -39,7 +44,7 @@ def wrapper(self, *args, **kwargs):
                         ENV_VAR_ENGINE_ROOM_APP_ID
                     )
 
-                log_function = getattr(exceptions_logger, log_level)
+                log_function = getattr(get_exceptions_logger(), log_level)
                 log_function(e, extra=properties)
                 raise e
 

datareservoirio/client.py

@@ -1,18 +1,19 @@
 import logging
+import os
 import time
 import warnings
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
-from functools import wraps
+from functools import cache, wraps
 from operator import itemgetter
 from urllib.parse import urlencode
 from uuid import uuid4
 
 import numpy as np
 import pandas as pd
 import requests
-from opencensus.ext.azure.log_exporter import AzureLogHandler
+from azure.monitor.opentelemetry import configure_azure_monitor
 from tenacity import (
     retry,
     retry_if_exception_type,
@@ -22,18 +23,29 @@
 )
 from tqdm.auto import tqdm
 
+from datareservoirio._constants import ENV_VAR_ENABLE_APP_INSIGHTS
+
 from ._logging import log_decorator
 from ._utils import function_translation, period_translation
 from .globalsettings import environment
 from .storage import Storage
 
 log = logging.getLogger(__name__)
 
-metric = logging.getLogger(__name__ + "_metric_appinsight")
-metric.setLevel(logging.DEBUG)
-metric.addHandler(
-    AzureLogHandler(connection_string=environment._application_insight_connectionstring)
-)
+
+@cache
+def metric() -> logging.Logger:
+    logger = logging.getLogger(__name__ + "_metric_appinsight")
+    if os.getenv(ENV_VAR_ENABLE_APP_INSIGHTS) is not None:
+        enable_app_insights = os.environ[ENV_VAR_ENABLE_APP_INSIGHTS].lower()
+        if enable_app_insights == "true" or enable_app_insights == "1":
+            logger.setLevel(logging.DEBUG)
+            configure_azure_monitor(
+                connection_string=environment._application_insight_connectionstring,
+                logger_name=__name__ + "_metric_appinsight",
+            )
+    return logger
+
 
 # Default values to push as start/end dates. (Limited by numpy.datetime64)
 _END_DEFAULT = 9214646400000000000  # 2262-01-01
@@ -321,15 +333,13 @@ def wrapper(self, series_id, start=None, end=None, **kwargs):
                 ).isoformat()
             number_of_samples = len(result)
             properties = {
-                "custom_dimensions": {
-                    "series_id": series_id,
-                    "start": start_date_as_str,
-                    "end": end_date_as_str,
-                    "elapsed": elapsed_time,
-                    "number-of-samples": number_of_samples,
-                }
+                "series_id": series_id,
+                "start": start_date_as_str,
+                "end": end_date_as_str,
+                "elapsed": elapsed_time,
+                "number-of-samples": number_of_samples,
             }
-            metric.info("Timer", extra=properties)
+            metric().info("Timer", extra=properties)
             return result
 
         return wrapper

pyproject.toml

@@ -26,10 +26,10 @@ dependencies = [
   "requests",
   "requests-oauthlib",
   "importlib_resources",
-  "opencensus-ext-azure",
   "tenacity<8.5",
   "urllib3 > 2",
   "tqdm",
+  "azure-monitor-opentelemetry",
 ]
 
 [project.urls]

tests/conftest.py

@@ -1,4 +1,3 @@
-import logging
 from io import BytesIO
 from pathlib import Path
 from unittest.mock import Mock
@@ -13,12 +12,6 @@
 TEST_PATH = Path(__file__).parent
 
 
-@pytest.fixture(autouse=True)
-def disable_logging(monkeypatch):
-    """Disable logging to Application Insight"""
-    monkeypatch.setattr("datareservoirio.client.AzureLogHandler", logging.NullHandler())
-
-
 @pytest.fixture
 def response_cases():
     class ResponseCaseHandler:

tests/test__logging.py

@@ -3,7 +3,9 @@
 
 import pytest
 
-from datareservoirio._logging import exceptions_logger, log_decorator
+from datareservoirio._logging import get_exceptions_logger, log_decorator
+
+exceptions_logger = get_exceptions_logger()
 
 
 class my_test_class:

tests/test_client.py

@@ -13,11 +13,13 @@
 from tenacity import RetryError
 
 import datareservoirio as drio
-from datareservoirio._logging import exceptions_logger
+from datareservoirio._logging import get_exceptions_logger
 from datareservoirio._utils import DataHandler
 
 TEST_PATH = Path(__file__).parent
 
+exceptions_logger = get_exceptions_logger()
+
 
 def change_logging(self, msg, *args, exc_info=True, **kwargs):
     if kwargs["extra"]: