Replace logger object with self.log

Author: yuvipanda

src/jupyterhub_cost_monitoring/aws.py

@@ -24,11 +24,8 @@
     SERVICE_COMPONENT_MAP,
 )
 from .date_utils import DateRange
-from .logs import get_logger
 from .prometheus import Prometheus
 
-logger = get_logger(__name__)
-
 
 class AWSCostExplorer(LoggingConfigurable):
     @functools.cache
@@ -37,7 +34,7 @@ def _get_component_name(self, service_name):
             return SERVICE_COMPONENT_MAP[service_name]
         else:
             # only printed once per service name thanks to memoization
-            logger.warning(
+            self.log.warning(
                 f"Service '{service_name}' not categorized as a component yet"
             )
             return "other"
@@ -255,7 +252,7 @@ def _process_home_storage_costs(
                         0.0, current_compute_cost - home_storage_cost
                     )
                     compute_entry["cost"] = f"{new_compute_cost:.2f}"
-                    logger.debug(
+                    self.log.debug(
                         f"Adjusted compute cost for {date}: {current_compute_cost:.2f} -> {new_compute_cost:.2f}"
                     )
 
@@ -267,7 +264,7 @@ def _process_home_storage_costs(
                         current_home_storage_cost + home_storage_cost
                     )
                     home_storage_entry["cost"] = f"{new_home_storage_cost:.2f}"
-                    logger.debug(
+                    self.log.debug(
                         f"Updated home storage cost for {date}: {current_home_storage_cost:.2f} -> {new_home_storage_cost:.2f}"
                     )
                 else:
@@ -281,7 +278,7 @@ def _process_home_storage_costs(
                     if date not in entries_by_date:
                         entries_by_date[date] = {}
                     entries_by_date[date]["home storage"] = new_entry
-                    logger.debug(
+                    self.log.debug(
                         f"Added new home storage entry for {date}: {home_storage_cost:.2f}"
                     )
 
@@ -340,7 +337,7 @@ def _process_core_costs(self, entries_by_date, core_cost_response):
             entries_by_date: Dictionary indexed by date containing component entries
             core_cost_response: AWS Cost Explorer response for core costs
         """
-        logger.debug(
+        self.log.debug(
             f"Processing core costs: {pformat(core_cost_response['ResultsByTime'])}"
         )
         for core_e in core_cost_response["ResultsByTime"]:
@@ -360,7 +357,7 @@ def _process_core_costs(self, entries_by_date, core_cost_response):
                     current_compute_cost = float(compute_entry["cost"])
                     new_compute_cost = max(0.0, current_compute_cost - core_cost)
                     compute_entry["cost"] = f"{new_compute_cost:.2f}"
-                    logger.debug(
+                    self.log.debug(
                         f"Adjusted compute cost for {date} (core cost): {current_compute_cost:.2f} -> {new_compute_cost:.2f}"
                     )
 
@@ -370,7 +367,7 @@ def _process_core_costs(self, entries_by_date, core_cost_response):
                     current_core_cost = float(core_entry["cost"])
                     new_core_cost = current_core_cost + core_cost
                     core_entry["cost"] = f"{new_core_cost:.2f}"
-                    logger.debug(
+                    self.log.debug(
                         f"Updated core cost for {date}: {current_core_cost:.2f} -> {new_core_cost:.2f}"
                     )
                 else:
@@ -384,7 +381,7 @@ def _process_core_costs(self, entries_by_date, core_cost_response):
                     if date not in entries_by_date:
                         entries_by_date[date] = {}
                     entries_by_date[date]["core"] = new_entry
-                    logger.debug(f"Added new core entry for {date}: {core_cost:.2f}")
+                    self.log.debug(f"Added new core entry for {date}: {core_cost:.2f}")
 
     @ttl_lru_cache(seconds_to_live=3600)
     def query_total_costs_per_component(
@@ -424,7 +421,7 @@ def query_total_costs_per_component(
 
         processed_response = []
 
-        logger.debug(f"Processing response: {pformat(response['ResultsByTime'])}")
+        self.log.debug(f"Processing response: {pformat(response['ResultsByTime'])}")
 
         for e in response["ResultsByTime"]:
             # coalesce service costs to component costs
@@ -438,7 +435,7 @@ def query_total_costs_per_component(
                 )
 
             # Filter to specific component if requested
-            logger.debug(f"Component costs before filtering: {component_costs}")
+            self.log.debug(f"Component costs before filtering: {component_costs}")
             if component:
                 component_costs = {
                     k: v for k, v in component_costs.items() if k == component
@@ -463,7 +460,7 @@ def query_total_costs_per_component(
                 entries_by_date[date] = {}
             entries_by_date[date][entry["component"]] = entry
 
-        logger.debug(f"Entries by date before deduplication: {entries_by_date}\n\n")
+        self.log.debug(f"Entries by date before deduplication: {entries_by_date}\n\n")
 
         # EC2 - Other is a service that can include costs for EBS volumes and snapshots
         # By default, these costs are mapped to the compute component, but
@@ -489,7 +486,7 @@ def query_total_costs_per_component(
             entries_by_date, home_storage_ebs_cost_response
         )
 
-        logger.debug(
+        self.log.debug(
             f"Entries by date after home storage processing: {entries_by_date}\n\n"
         )
 
@@ -511,7 +508,7 @@ def query_total_costs_per_component(
         # Process core costs and adjust compute costs accordingly
         self._process_core_costs(entries_by_date, core_cost_response)
 
-        logger.debug(
+        self.log.debug(
             f"Entries by date after core cost processing: {entries_by_date}\n\n"
         )
 
@@ -633,7 +630,7 @@ def query_total_costs_per_user(
                 )
             top_users = sorted(user_costs.items(), key=lambda x: -x[1])[:limit]
             top_user_set = {user for user, _ in top_users}
-            logger.debug(f"Top users: {top_users}")
+            self.log.debug(f"Top users: {top_users}")
             results = [entry for entry in results if entry["user"] in top_user_set]
         results = self.prometheus._filter_json(
             results, hub=hub, component=component, user=user, usergroup=usergroup
@@ -660,12 +657,12 @@ def query_total_costs_per_group(
         try:
             results = self.query_total_costs_per_user(date_range=date_range)
         except Exception as e:
-            logger.exception(f"HTTP request failed: {e}")
+            self.log.exception(f"HTTP request failed: {e}")
             raise
         response = {}
         for r in results:
             key = (r["date"], r["usergroup"])
-            logger.debug(f"Key: {key}, Value: {r['value']}")
+            self.log.debug(f"Key: {key}, Value: {r['value']}")
             response[key] = response.get(key, 0) + float(r["value"])
 
         final_response = [

src/jupyterhub_cost_monitoring/logs.py

@@ -15,9 +15,6 @@
 from .cache import ttl_lru_cache
 from .const_usage import USAGE_MAP, USER_GROUP_INFO
 from .date_utils import DateRange, get_now_date
-from .logs import get_logger
-
-logger = get_logger(__name__)
 
 
 class Prometheus(LoggingConfigurable):
@@ -76,7 +73,7 @@ def query(self, query: str, date_range: DateRange, step: str) -> requests.Respon
         with requests.get(
             query_api, params=parameters, auth=prometheus_auth
         ) as response:
-            logger.info(f"Querying Prometheus: {response.url}")
+            self.log.info(f"Querying Prometheus: {response.url}")
             response.raise_for_status()
             result = response.json()
             return result
@@ -172,7 +169,7 @@ def _process_response(
                             entry["user"], escape_char="-"
                         )
                     except ValueError:
-                        logger.warning(
+                        self.log.warning(
                             f"Could not unescape username {entry['user']} for home storage component."
                         )
                         continue
@@ -288,7 +285,7 @@ def query_user_groups(
         try:
             response = self.query(USER_GROUP_INFO, date_range, step="1d")
         except requests.exceptions.RequestException as e:
-            logger.exception(f"HTTP request failed: {e}")
+            self.log.exception(f"HTTP request failed: {e}")
             raise
         result = self._process_user_groups(response, hub_name, user_name, group_name)
         return result
@@ -333,7 +330,7 @@ def query_users_with_multiple_groups(
         try:
             response = self.query_user_groups(hub_name=hub_name, user_name=user_name)
         except requests.exceptions.RequestException as e:
-            logger.exception(f"HTTP request failed: {e}")
+            self.log.exception(f"HTTP request failed: {e}")
             raise
         grouped = defaultdict(
             lambda: {
@@ -372,7 +369,7 @@ def query_users_with_no_groups(
         try:
             response = self.query_user_groups(hub_name=hub_name, user_name=user_name)
         except requests.exceptions.RequestException as e:
-            logger.exception(f"HTTP request failed: {e}")
+            self.log.exception(f"HTTP request failed: {e}")
             raise
         grouped = defaultdict(lambda: {"username": None, "hub": None})
         for entry in response:
@@ -381,7 +378,7 @@ def query_users_with_no_groups(
                 grouped[key]["username"] = entry["username"]
                 grouped[key]["hub"] = entry["hub"]
                 if entry["usergroup"] == "none":
-                    logger.debug(
+                    self.log.debug(
                         f"User {entry['username']} in hub {entry['hub']} has no groups."
                     )
                     grouped[key]["has_none"] = True