Skip to content

Commit 625180a

Browse files
committed
Remove extra layer of indirection in 'logs.py'
This removes an extra layer of indirection
1 parent 1fb3ef2 commit 625180a

6 files changed

Lines changed: 10 additions & 31 deletions

File tree

src/jupyterhub_cost_monitoring/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from datetime import timedelta
22

33
import requests
4+
import logging
45
from fastapi import FastAPI, HTTPException, Query
56
from fastapi.responses import Response
67
from prometheus_client import CONTENT_TYPE_LATEST, generate_latest
78

89
from .const_usage import USAGE_MAP
910
from .date_utils import get_now_date, parse_from_to_in_query_params
10-
from .logs import get_logger
1111
from .metrics import MetricsMiddleware
1212
from .query_cost_aws import (
1313
query_hub_names,
@@ -26,7 +26,7 @@
2626

2727
app = FastAPI()
2828
app.add_middleware(MetricsMiddleware)
29-
logger = get_logger(__name__)
29+
logger = logging.getLogger(__name__)
3030

3131

3232
@app.get("/")

src/jupyterhub_cost_monitoring/logs.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/jupyterhub_cost_monitoring/query_cost_aws.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
SERVICE_COMPONENT_MAP,
2323
)
2424
from .date_utils import DateRange
25-
from .logs import get_logger
25+
import logging
2626
from .query_usage import _filter_json, query_usage, query_user_groups
2727

28-
logger = get_logger(__name__)
28+
logger = logging.getLogger(__name__)
2929
aws_ce_client = boto3.client("ce")
3030

3131

src/jupyterhub_cost_monitoring/query_usage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
from .cache import ttl_lru_cache
1414
from .const_usage import USAGE_MAP, USER_GROUP_INFO
1515
from .date_utils import DateRange, get_now_date
16-
from .logs import get_logger
16+
import logging
1717

18-
logger = get_logger(__name__)
18+
logger = logging.getLogger(__name__)
1919

2020
prometheus_host = os.environ.get("SUPPORT_PROMETHEUS_SERVER_SERVICE_HOST", "localhost")
2121
prometheus_port = int(os.environ.get("SUPPORT_PROMETHEUS_SERVER_SERVICE_PORT", 9090))

tests/test_cost.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import pandas as pd
22

3-
from src.jupyterhub_cost_monitoring.logs import get_logger
3+
import logging
44
from src.jupyterhub_cost_monitoring.query_usage import _calculate_daily_cost_factors
55

6-
logger = get_logger(__name__)
6+
logger = logging.getLogger(__name__)
77

88

99
def test_cost_factor_by_hub(input_data_usage, output_data_hub):

tests/test_integration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
METRICS_UNBLENDED_COST,
88
)
99
from src.jupyterhub_cost_monitoring.date_utils import parse_from_to_in_query_params
10-
from src.jupyterhub_cost_monitoring.logs import get_logger
10+
import logging
1111
from src.jupyterhub_cost_monitoring.query_cost_aws import (
1212
query_total_costs_per_component,
1313
)
1414

15-
logger = get_logger(__name__)
15+
logger = logging.getLogger(__name__)
1616

1717
date_range = parse_from_to_in_query_params("2025-09-01", "2025-09-02")
1818

0 commit comments

Comments
 (0)