[executors] fix: add __init__.py to entrypoints and refine logging

Author: AndreyMarkinPPC

libs/exporters/garf_exporter/entrypoints/__init__.py

@@ -26,11 +26,12 @@
 import datetime
 
 import fastapi
-import garf_exporter
 import prometheus_client
 import requests
 import uvicorn
 from garf_executors.entrypoints import utils as garf_utils
+
+import garf_exporter
 from garf_exporter import exporter_service
 
 
@@ -80,12 +81,6 @@ def healthcheck(host: str, port: int) -> bool:
 metrics_app = prometheus_client.make_asgi_app(registry=exporter.registry)
 app.mount('/metrics', metrics_app)
 
-logger = garf_utils.init_logging(
-  loglevel='INFO',
-  logger_type='rich',
-  name='garf-exporter',
-)
-
 
 async def start_metric_generation(
   request: exporter_service.GarfExporterRequest,
@@ -153,6 +148,11 @@ def main() -> None:  # noqa: D103
   parser.add_argument('--collectors', dest='collectors', default='default')
   parser.add_argument('-v', '--version', dest='version', action='store_true')
   args, kwargs = parser.parse_known_args()
+  garf_utils.init_logging(
+    loglevel=args.loglevel,
+    logger_type=args.logger,
+    name='garf-exporter',
+  )
   cli_parameters = garf_utils.ParamsParser(['macro', 'source']).parse(kwargs)
   runtime_options = exporter_service.GarfExporterRuntimeOptions(
     expose_type=args.expose_type,

libs/exporters/garf_exporter/entrypoints/cli.py

@@ -26,6 +26,8 @@
 import garf_core
 import prometheus_client
 
+logger = logging.getLogger(__name__)
+
 
 class GarfExporter:
   """Exposes reports from Ads API in Prometheus format.
@@ -181,7 +183,7 @@ def _define_metrics(
     if virtual_columns := query_specification.virtual_columns:
       for column, field in virtual_columns.items():
         metrics[column] = self._define_gauge(column, suffix, labels, namespace)
-    logging.debug('metrics: %s', metrics)
+    logger.debug('metrics: %s', metrics)
     return metrics
 
   def _define_labels(
@@ -205,7 +207,7 @@ def _define_labels(
     for column, field in zip(non_virtual_columns, query_specification.fields):
       if 'metric' not in field and 'metric' not in column:
         labelnames.append(str(column))
-    logging.debug('labelnames: %s', labelnames)
+    logger.debug('labelnames: %s', labelnames)
     return labelnames
 
   def _define_gauge(

libs/exporters/garf_exporter/exporter.py

@@ -30,6 +30,8 @@
 import garf_exporter
 from garf_exporter import collector
 
+logger = logging.getLogger(__name__)
+
 
 class GarfExporterRuntimeOptions(pydantic.BaseModel):
   """Options to finetune exporting process.
@@ -121,14 +123,14 @@ def generate_metrics(
       request: Complete request to fetch and expose data.
       exporter: Initialized GarfExporter.
     """
-    logging.info('Beginning export')
+    logger.info('Beginning export')
     start_export_time = time()
     exporter.export_started.set(start_export_time)
     collectors = request.collectors or collector.load_collector_data(
       request.collectors_config
     )
     for col in collectors:
-      logging.info('Exporting from collector: %s', col.title)
+      logger.info('Exporting from collector: %s', col.title)
       start = time()
       report = self.fetcher.fetch(col.query, **self.source_parameters)
       end = time()
@@ -138,7 +140,7 @@ def generate_metrics(
         suffix=col.suffix,
         collector=col.title,
       )
-    logging.info('Export completed')
+    logger.info('Export completed')
     end_export_time = time()
     exporter.export_completed.set(end_export_time)
     exporter.total_export_time_gauge.set(end_export_time - start_export_time)