feat(common): complete Phase 1 - project config, structured logging, and ClickHouse DDL

This commit is contained in:
2026-09-19 13:12:04 +03:30
parent 5f75a1a2be
commit 43df200eeb
9 changed files with 364 additions and 3 deletions

1
app/common/__init__.py Normal file
View File

@@ -0,0 +1 @@
# app/common package

83
app/common/config.py Normal file
View File

@@ -0,0 +1,83 @@
import os
from dataclasses import dataclass
def get_env_str(key: str, default: str) -> str:
return os.getenv(key, default)
def get_env_int(key: str, default: int) -> int:
val = os.getenv(key)
if val is None or not val.strip():
return default
return int(val)
def get_env_float(key: str, default: float) -> float:
val = os.getenv(key)
if val is None or not val.strip():
return default
return float(val)
@dataclass(frozen=True)
class APIConfig:
host: str = get_env_str("API_HOST", "0.0.0.0")
port: int = get_env_int("API_PORT", 8000)
queue_max_size: int = get_env_int("API_QUEUE_MAX_SIZE", 10000)
worker_stats_url: str = get_env_str(
"WORKER_STATS_URL", "http://worker:8001/internal/stats"
)
@dataclass(frozen=True)
class WorkerConfig:
instance_id: str = get_env_str("WORKER_INSTANCE", "worker-1")
stats_host: str = get_env_str("WORKER_STATS_HOST", "0.0.0.0")
stats_port: int = get_env_int("WORKER_STATS_PORT", 8001)
@dataclass(frozen=True)
class KafkaConfig:
bootstrap_servers: str = get_env_str("KAFKA_BOOTSTRAP_SERVERS", "localhost:9092")
raw_topic: str = get_env_str("KAFKA_RAW_TOPIC", "cdr.raw")
dlq_topic: str = get_env_str("KAFKA_DLQ_TOPIC", "cdr.raw.dlq")
consumer_group: str = get_env_str("KAFKA_CONSUMER_GROUP", "cdr-processing-group")
auto_offset_reset: str = get_env_str("KAFKA_AUTO_OFFSET_RESET", "earliest")
@dataclass(frozen=True)
class ClickHouseConfig:
host: str = get_env_str("CLICKHOUSE_HOST", "localhost")
port: int = get_env_int("CLICKHOUSE_PORT", 8123)
user: str = get_env_str("CLICKHOUSE_USER", "default")
password: str = get_env_str("CLICKHOUSE_PASSWORD", "")
database: str = get_env_str("CLICKHOUSE_DATABASE", "telecom")
table: str = get_env_str("CLICKHOUSE_TABLE", "cdr_records")
@dataclass(frozen=True)
class BatchConfig:
size: int = get_env_int("BATCH_SIZE", 1000)
flush_interval_seconds: float = get_env_float("BATCH_FLUSH_INTERVAL_SECONDS", 2.0)
@dataclass(frozen=True)
class RetryConfig:
max_attempts: int = get_env_int("CH_RETRY_MAX_ATTEMPTS", 3)
initial_delay_ms: int = get_env_int("CH_RETRY_INITIAL_DELAY_MS", 500)
backoff_factor: float = get_env_float("CH_RETRY_BACKOFF_FACTOR", 2.0)
@dataclass(frozen=True)
class AppConfig:
api: APIConfig = APIConfig()
worker: WorkerConfig = WorkerConfig()
kafka: KafkaConfig = KafkaConfig()
clickhouse: ClickHouseConfig = ClickHouseConfig()
batch: BatchConfig = BatchConfig()
retry: RetryConfig = RetryConfig()
log_level: str = get_env_str("LOG_LEVEL", "INFO")
config = AppConfig()

87
app/common/logging.py Normal file
View File

@@ -0,0 +1,87 @@
import json
import logging
import sys
from datetime import datetime, timezone
from typing import Any, Dict, Optional
class StructuredJsonFormatter(logging.Formatter):
"""
JSON log formatter emitting structured log records with standard telecom pipeline fields:
- timestamp (ISO 8601 UTC)
- level (INFO, WARN, ERROR, DEBUG)
- service (service name)
- raw_id (record identifier or None)
- event (message string)
"""
def __init__(self, service_name: str):
super().__init__()
self.service_name = service_name
def format(self, record: logging.LogRecord) -> str:
log_entry: Dict[str, Any] = {
"timestamp": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
"level": record.levelname,
"service": getattr(record, "service", self.service_name),
"raw_id": getattr(record, "raw_id", None),
"event": record.getMessage(),
}
# Include exception info if present
if record.exc_info:
log_entry["exception"] = self.formatException(record.exc_info)
# Include additional extra context fields if present
for key, value in record.__dict__.items():
if key not in {
"name",
"msg",
"args",
"levelname",
"levelno",
"pathname",
"filename",
"module",
"exc_info",
"exc_text",
"stack_info",
"lineno",
"funcName",
"created",
"msecs",
"relativeCreated",
"thread",
"threadName",
"processName",
"process",
"raw_id",
"service",
}:
log_entry[key] = value
return json.dumps(log_entry, default=str)
def setup_logger(
service_name: str, level: Optional[str] = None
) -> logging.Logger:
"""
Configures and returns a logger configured with StructuredJsonFormatter on stdout.
"""
if level is None:
from app.common.config import config
level = config.log_level
logger = logging.getLogger(service_name)
logger.setLevel(getattr(logging, level.upper(), logging.INFO))
logger.propagate = False
# Avoid duplicate handlers if setup is called multiple times
if not logger.handlers:
handler = logging.StreamHandler(sys.stdout)
handler.setFormatter(StructuredJsonFormatter(service_name=service_name))
logger.addHandler(handler)
return logger