##// END OF EJS Templates
chore(http-client): small refactor and use fstrings
chore(http-client): small refactor and use fstrings

File last commit:

r5088:8f6d1ed6 default
r5260:e241ac2a default
Show More
request_wrapper.py
96 lines | 3.4 KiB | text/x-python | PythonLexer
libs: removed utf8 markers
r5054
project: added all source files and assets
r1
copyrights: updated for 2023
r5088 # Copyright (C) 2016-2023 RhodeCode GmbH
project: added all source files and assets
r1 #
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License, version 3
# (only), as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
# This program is dual-licensed. If you wish to learn more about the
# RhodeCode Enterprise Edition, including its added features, Support services,
# and proprietary license terms, please see https://rhodecode.com/licenses/
import time
import logging
request-wrapper: show version for rhodecode in logs.
r3926 import rhodecode
request-wrapper: expose usernames for better auditing capabilities.
r4347 from rhodecode.lib.auth import AuthUser
PATH_INFO: use new method to consistently extract proper PATH_INFO data
r5032 from rhodecode.lib.base import get_ip_addr, get_user_agent
from rhodecode.lib.middleware.utils import get_path_info
request-wrapper: expose usernames for better auditing capabilities.
r4347 from rhodecode.lib.utils2 import safe_str, get_current_rhodecode_user
project: added all source files and assets
r1
log = logging.getLogger(__name__)
class RequestWrapperTween(object):
def __init__(self, handler, registry):
self.handler = handler
self.registry = registry
# one-time configuration code goes here
app: added statsd calls for monitoring.
r4632 def _get_user_info(self, request):
user = get_current_rhodecode_user(request)
if not user:
user = AuthUser.repr_user(ip=get_ip_addr(request.environ))
return user
project: added all source files and assets
r1 def __call__(self, request):
start = time.time()
request-wrapper: ensure we wrap WHOLE request not just logic after http detection.
r4157 log.debug('Starting request time measurement')
metrics: expose exc_type in consistent format
r4808 response = None
middlewares: all porting for python3
r5082 request.req_wrapper_start = start
project: added all source files and assets
r1 try:
response = self.handler(request)
finally:
request-wrapper: add request counters
r3874 count = request.request_count()
request-wrapper: show version for rhodecode in logs.
r3926 _ver_ = rhodecode.__version__
PATH_INFO: use new method to consistently extract proper PATH_INFO data
r5032 _path = get_path_info(request.environ)
metrics: added new statsd client and enabled new metrics on app
r4792 _auth_user = self._get_user_info(request)
logging: expose extra metadata to various important logs for loki
r4816 ip = get_ip_addr(request.environ)
match_route = request.matched_route.name if request.matched_route else "NOT_FOUND"
metrics: expose response code to logs
r4820 resp_code = getattr(response, 'status_code', 'UNDEFINED')
metrics: fixed celery task names, fixed hiistogram type metrics, client small fixes
r4807
app: added statsd calls for monitoring.
r4632 total = time.time() - start
logging: use lazy parameter evaluation in log calls.
r3061 log.info(
request-wrapper: expose usernames for better auditing capabilities.
r4347 'Req[%4s] %s %s Request to %s time: %.4fs [%s], RhodeCode %s',
metrics: added new statsd client and enabled new metrics on app
r4792 count, _auth_user, request.environ.get('REQUEST_METHOD'),
logging: expose extra metadata to various important logs for loki
r4816 _path, total, get_user_agent(request. environ), _ver_,
extra={"time": total, "ver": _ver_, "ip": ip,
metrics: expose response code to logs
r4820 "path": _path, "view_name": match_route, "code": resp_code}
project: added all source files and assets
r1 )
metrics: added new statsd client and enabled new metrics on app
r4792 statsd = request.registry.statsd
if statsd:
metrics: use non decimal version for timer....
r4806 elapsed_time_ms = round(1000.0 * total) # use ms only
metrics: added new statsd client and enabled new metrics on app
r4792 statsd.timing(
metrics: fixed celery task names, fixed hiistogram type metrics, client small fixes
r4807 "rhodecode_req_timing.histogram", elapsed_time_ms,
metrics: added new statsd client and enabled new metrics on app
r4792 tags=[
metrics: fixed exc type metrics
r4805 "view_name:{}".format(match_route),
metrics: add response code, and fix user problem on metrics
r4794 "code:{}".format(resp_code)
metrics: use non decimal version for timer....
r4806 ],
use_decimals=False
metrics: added new statsd client and enabled new metrics on app
r4792 )
statsd.incr(
metrics: fix request total name
r4804 'rhodecode_req_total', tags=[
metrics: fixed exc type metrics
r4805 "view_name:{}".format(match_route),
metrics: add response code, and fix user problem on metrics
r4794 "code:{}".format(resp_code)
metrics: added new statsd client and enabled new metrics on app
r4792 ])
project: added all source files and assets
r1 return response
def includeme(config):
config.add_tween(
'rhodecode.lib.middleware.request_wrapper.RequestWrapperTween',
request-wrapper: show http method in summary log entry.
r3430 )