Merge pull request #22 from JobDri-Developer/fix/unmask-openai-usage-token-metrics

[Fix] OpenAI 사용량 토큰 로그 마스킹 예외 처리

Author: whc9999

app/logging_utils.py

@@ -28,6 +28,13 @@
     "token",
     "api_key",
 )
+NON_SENSITIVE_TOKEN_METRIC_FIELDS = {
+    "inputtokens",
+    "outputtokens",
+    "totaltokens",
+    "cachedinputtokens",
+    "reasoningoutputtokens",
+}
 STANDARD_LOG_RECORD_FIELDS = set(logging.makeLogRecord({}).__dict__.keys()) | {"message", "asctime"}
 DEFAULT_LOG_CONTEXT: dict[str, Any] = {
     "requestId": None,
@@ -166,4 +173,6 @@ def _sanitize_value(key: str, value: Any) -> Any:
 
 def _is_sensitive_key(key: str) -> bool:
     lowered = key.lower()
+    if lowered in NON_SENSITIVE_TOKEN_METRIC_FIELDS:
+        return False
     return any(token in lowered for token in SENSITIVE_FIELD_TOKENS)

tests/test_recovery_flow.py

@@ -100,7 +100,7 @@ def __init__(self, *args, **kwargs) -> None:
 from app.api_client import SpringWorkerApiClient
 from app.config import settings
 from app.consumer import RabbitMqConsumer
-from app.logging_utils import WorkerContextFilter, bind_log_context
+from app.logging_utils import JsonLogFormatter, WorkerContextFilter, bind_log_context
 from app.openai_client import AnalysisOpenAiWorker
 from app.recovery import PendingDeliveryStore, TerminalMessageStore
 from app.schemas import (
@@ -527,6 +527,33 @@ def test_worker_context_filter_sets_defaults_for_missing_fields(self) -> None:
         self.assertIsNone(log_record.retryCount)
         self.assertEqual(log_record.logType, "application")
 
+    def test_json_log_formatter_does_not_mask_token_usage_metrics(self) -> None:
+        log_record = logging.LogRecord(
+            name="app.openai_client",
+            level=logging.INFO,
+            pathname=__file__,
+            lineno=1,
+            msg="OpenAI analysis 호출이 완료되었습니다.",
+            args=(),
+            exc_info=None,
+        )
+        log_record.event = "openai.generate.completed"
+        log_record.inputTokens = 12000
+        log_record.outputTokens = 1500
+        log_record.totalTokens = 13500
+        log_record.cachedInputTokens = 1024
+        log_record.reasoningOutputTokens = 0
+        log_record.openai_api_key = "sk-test"
+
+        payload = json.loads(JsonLogFormatter().format(log_record))
+
+        self.assertEqual(payload["inputTokens"], 12000)
+        self.assertEqual(payload["outputTokens"], 1500)
+        self.assertEqual(payload["totalTokens"], 13500)
+        self.assertEqual(payload["cachedInputTokens"], 1024)
+        self.assertEqual(payload["reasoningOutputTokens"], 0)
+        self.assertEqual(payload["openai_api_key"], "***masked***")
+
     def test_deserialize_message_reads_headers(self) -> None:
         consumer = RabbitMqConsumer(
             api_client=FakeApiClient(),