Merge branch 'main' into avm99963-monorail
Merged commit 3779da353b36d43cf778e7d4f468097714dd4540
GitOrigin-RevId: 6451a5c6b75afb0fd1f37b3f14521148d0722ea8
diff --git a/framework/monitoring.py b/framework/monitoring.py
index 6407e2d..08a1e23 100644
--- a/framework/monitoring.py
+++ b/framework/monitoring.py
@@ -4,13 +4,10 @@
"""Monitoring ts_mon custom to monorail."""
-import os
-import sys
-lib_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'lib')
-
-from google.cloud import logging
from infra_libs import ts_mon
+
from framework import framework_helpers
+from framework import logger
import settings
@@ -49,11 +46,9 @@
API_REQUESTS_COUNT.increment_by(1, fields)
if not settings.unit_test_mode:
- logging_client = logging.Client()
- logger = logging_client.logger("request_log")
- logger.log_struct(
+ logger.log(
{
- 'log_type': "IncrementAPIRequestsCount",
+ 'log_type': 'IncrementAPIRequestsCount',
'client_id': client_id,
'client_email': client_email,
'requests_count': str(API_REQUESTS_COUNT.get(fields)),