Skip to content

Commit 1febbe7

Browse files
Make logging set up part of exporter startup, not import side effect (#633)
* make logging set up part of exporter startup, not import side effect Signed-off-by: Kevin M Granger <kgranger@redhat.com> * Add logging setup to log unit test Signed-off-by: Kevin M Granger <kgranger@redhat.com> * Set up logging for release time exporter Signed-off-by: Kevin M Granger <kgranger@redhat.com>
1 parent a47d4ad commit 1febbe7

6 files changed

Lines changed: 9 additions & 4 deletions

File tree

exporters/committime/app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ def make_collector(self) -> AbstractCommitCollector:
156156

157157

158158
if __name__ == "__main__":
159+
pelorus.setup_logging()
159160
provider_config = load_and_log(CommittimeTypeConfig)
160161

161162
dyn_client = pelorus.utils.get_k8s_client()

exporters/deploytime/app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ def get_replicas(
208208

209209

210210
if __name__ == "__main__":
211+
pelorus.setup_logging()
211212
dyn_client = pelorus.utils.get_k8s_client()
212213

213214
namespaces = {

exporters/extra/releasetime/app.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
from prometheus_client import start_http_server
44
from prometheus_client.core import REGISTRY
55

6+
import pelorus
67
from extra.releasetime import collector_github
78

89
if __name__ == "__main__":
10+
pelorus.setup_logging()
911
collector = collector_github.make_collector()
1012

1113
REGISTRY.register(collector)

exporters/failure/app.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def getCollector() -> AbstractFailureCollector:
7070

7171

7272
if __name__ == "__main__":
73+
pelorus.setup_logging()
7374
logging.info("===== Starting Failure Collector =====")
7475

7576
collector = TrackerFactory.getCollector()

exporters/pelorus/__init__.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def _print_version():
5555

5656

5757
# region: logging setup
58-
def _setup_logging():
58+
def setup_logging():
5959
_print_version()
6060
loglevel = utils.get_env_var("LOG_LEVEL", DEFAULT_LOG_LEVEL).upper()
6161
numeric_level = getattr(logging, loglevel, None)
@@ -72,9 +72,6 @@ def _setup_logging():
7272
print(f"Initializing Logger with LogLevel: {loglevel}")
7373

7474

75-
_setup_logging()
76-
77-
7875
# endregion
7976

8077
# A NamespaceSpec lists namespaces to restrict the search to.

exporters/tests/test_config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pytest
44
from attrs import define, field
55

6+
import pelorus
67
from pelorus.config import load_and_log
78
from pelorus.config.converters import comma_separated
89
from pelorus.config.loading import env_vars, no_env_vars
@@ -86,6 +87,8 @@ class OtherConfig:
8687

8788

8889
def test_logging(caplog: pytest.LogCaptureFixture):
90+
pelorus.setup_logging()
91+
8992
@define(kw_only=True)
9093
class Loggable:
9194
regular_field: str = field(default="LOG ME 1")

0 commit comments

Comments
 (0)