Skip to content

Commit c0dfbcf

Browse files
committed
refactor: simplify structlog and use structlog.get_logger directly
Consolidate logging into utilities/logger.py: ProcessorFormatter with ConsoleRenderer (console) and JSONRenderer (file), configure_structlog() in setup_logging(), and _StructlogQueueHandler so event dicts survive the queue. Remove utilities/opendatahub_logger.py. Replace get_logger() wrapper with import structlog and structlog.get_logger(name=__name__) across tests and utilities. Signed-off-by: Jorge Garcia Oncins <jgarciao@redhat.com> Made-with: Cursor Signed-off-by: Jorge Garcia Oncins <jgarciao@redhat.com>
1 parent a9ba894 commit c0dfbcf

File tree

189 files changed

+555
-738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+555
-738
lines changed

tests/cluster_health/test_cluster_health.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import pytest
2+
import structlog
23
from ocp_resources.node import Node
34
from ocp_utilities.infra import assert_nodes_in_healthy_condition, assert_nodes_schedulable
45

5-
from utilities.opendatahub_logger import get_logger
6-
7-
LOGGER = get_logger(name=__name__)
6+
LOGGER = structlog.get_logger(name=__name__)
87

98

109
@pytest.mark.cluster_health

tests/cluster_health/test_operator_health.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import pytest
2+
import structlog
23
from kubernetes.dynamic import DynamicClient
34
from ocp_resources.data_science_cluster import DataScienceCluster
45
from ocp_resources.dsc_initialization import DSCInitialization
56
from pytest_testconfig import config as py_config
67

78
from utilities.general import wait_for_pods_running
89
from utilities.infra import wait_for_dsc_status_ready, wait_for_dsci_status_ready
9-
from utilities.opendatahub_logger import get_logger
1010

11-
LOGGER = get_logger(name=__name__)
11+
LOGGER = structlog.get_logger(name=__name__)
1212

1313

1414
@pytest.mark.operator_health

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import pytest
1111
import shortuuid
12+
import structlog
1213
import yaml
1314
from _pytest._py.path import LocalPath
1415
from _pytest.legacypath import TempdirFactory
@@ -64,12 +65,11 @@
6465
from utilities.logger import RedactedString
6566
from utilities.mariadb_utils import wait_for_mariadb_operator_deployments
6667
from utilities.minio import create_minio_data_connection_secret
67-
from utilities.opendatahub_logger import get_logger
6868
from utilities.operator_utils import get_cluster_service_version, get_csv_related_images
6969
from utilities.serving_runtime import get_runtime_image_from_template
7070
from utilities.user_utils import get_byoidc_issuer_url, get_oidc_tokens
7171

72-
LOGGER = get_logger(name=__name__)
72+
LOGGER = structlog.get_logger(name=__name__)
7373

7474
pytest_plugins = [
7575
"tests.fixtures.inference",

tests/fixtures/inference.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from typing import Any
33

44
import pytest
5+
import structlog
56
from kubernetes.dynamic import DynamicClient
67
from ocp_resources.data_science_cluster import DataScienceCluster
78
from ocp_resources.deployment import Deployment
@@ -23,10 +24,9 @@
2324
)
2425
from utilities.inference_utils import create_isvc
2526
from utilities.infra import get_data_science_cluster, wait_for_dsc_status_ready
26-
from utilities.opendatahub_logger import get_logger
2727
from utilities.serving_runtime import ServingRuntimeFromTemplate
2828

29-
LOGGER = get_logger(name=__name__)
29+
LOGGER = structlog.get_logger(name=__name__)
3030

3131

3232
@pytest.fixture(scope="class")

tests/llama_stack/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import httpx
66
import pytest
7+
import structlog
78
from _pytest.fixtures import FixtureRequest
89
from kubernetes.dynamic import DynamicClient
910
from llama_stack_client import APIError, LlamaStackClient
@@ -42,10 +43,9 @@
4243
from utilities.constants import Annotations, DscComponents
4344
from utilities.data_science_cluster_utils import update_components_in_dsc
4445
from utilities.general import generate_random_name
45-
from utilities.opendatahub_logger import get_logger
4646
from utilities.resources.llama_stack_distribution import LlamaStackDistribution
4747

48-
LOGGER = get_logger(name=__name__)
48+
LOGGER = structlog.get_logger(name=__name__)
4949

5050
pytestmark = pytest.mark.skip_on_disconnected
5151

tests/llama_stack/inference/test_completions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import pytest
2+
import structlog
23
from llama_stack_client import LlamaStackClient
34

45
from tests.llama_stack.constants import ModelInfo
5-
from utilities.opendatahub_logger import get_logger
66

7-
LOGGER = get_logger(name=__name__)
7+
LOGGER = structlog.get_logger(name=__name__)
88

99

1010
@pytest.mark.parametrize(

tests/llama_stack/safety/test_trustyai_fms_provider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import pytest
2+
import structlog
23
import yaml
34

45
from tests.llama_stack.constants import LlamaStackProviders
56
from utilities.constants import BUILTIN_DETECTOR_CONFIG, CHAT_GENERATION_CONFIG, QWEN_MODEL_NAME, MinIo
6-
from utilities.opendatahub_logger import get_logger
77

8-
LOGGER = get_logger(name=__name__)
8+
LOGGER = structlog.get_logger(name=__name__)
99
SECURE_SHIELD_ID: str = "secure_shield"
1010

1111

tests/llama_stack/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from typing import Any
88

99
import requests
10+
import structlog
1011
from kubernetes.dynamic import DynamicClient
1112
from kubernetes.dynamic.exceptions import ResourceNotFoundError
1213
from llama_stack_client import APIConnectionError, InternalServerError, LlamaStackClient
@@ -19,11 +20,10 @@
1920
LLS_CORE_POD_FILTER,
2021
)
2122
from utilities.exceptions import UnexpectedResourceCountError
22-
from utilities.opendatahub_logger import get_logger
2323
from utilities.path_utils import resolve_repo_path
2424
from utilities.resources.llama_stack_distribution import LlamaStackDistribution
2525

26-
LOGGER = get_logger(name=__name__)
26+
LOGGER = structlog.get_logger(name=__name__)
2727

2828

2929
def _assert_file_uploaded(uploaded_file: File, expected_purpose: str) -> None:

tests/llama_stack/vector_io/test_vector_stores.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import pytest
2+
import structlog
23
from llama_stack_client import LlamaStackClient
34
from llama_stack_client.types.vector_store import VectorStore
45

@@ -8,9 +9,8 @@
89
IBM_EARNINGS_SEARCH_QUERIES_BY_MODE,
910
ModelInfo,
1011
)
11-
from utilities.opendatahub_logger import get_logger
1212

13-
LOGGER = get_logger(name=__name__)
13+
LOGGER = structlog.get_logger(name=__name__)
1414

1515

1616
@pytest.mark.parametrize(

tests/model_explainability/evalhub/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
from typing import Any
33

44
import pytest
5+
import structlog
56
from kubernetes.dynamic import DynamicClient
67
from ocp_resources.deployment import Deployment
78
from ocp_resources.namespace import Namespace
89
from ocp_resources.route import Route
910

1011
from utilities.certificates_utils import create_ca_bundle_file
1112
from utilities.constants import Timeout
12-
from utilities.opendatahub_logger import get_logger
1313
from utilities.resources.evalhub import EvalHub
1414

15-
LOGGER = get_logger(name=__name__)
15+
LOGGER = structlog.get_logger(name=__name__)
1616

1717

1818
@pytest.fixture(scope="class")

0 commit comments

Comments
 (0)