# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-12-26 18:52:17
# Node ID 3d2cea78b87f9a01e8bbfa50411d2422fcc95b9f
# Parent  5c498811ff89f0d78f4763d9e6210b54b3e421c5

request-wrapper: ensure we wrap WHOLE request not just logic after http detection.

diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -428,9 +428,7 @@ def sanitize_settings_and_apply_defaults
             settings['beaker.session.url'] = 'redis://' + raw_url
 
     # Default includes, possible to change as a user
-    pyramid_includes = settings.setdefault('pyramid.includes', [
-        'rhodecode.lib.middleware.request_wrapper',
-    ])
+    pyramid_includes = settings.setdefault('pyramid.includes', [])
     log.debug(
         "Using the following pyramid.includes: %s",
         pyramid_includes)
diff --git a/rhodecode/lib/middleware/request_wrapper.py b/rhodecode/lib/middleware/request_wrapper.py
--- a/rhodecode/lib/middleware/request_wrapper.py
+++ b/rhodecode/lib/middleware/request_wrapper.py
@@ -38,6 +38,7 @@ class RequestWrapperTween(object):
 
     def __call__(self, request):
         start = time.time()
+        log.debug('Starting request time measurement')
         try:
             response = self.handler(request)
         finally:
diff --git a/rhodecode/tweens.py b/rhodecode/tweens.py
--- a/rhodecode/tweens.py
+++ b/rhodecode/tweens.py
@@ -116,3 +116,6 @@ def includeme(config):
                           'pyramid.events.ContextFound')
     config.add_tween('rhodecode.tweens.vcs_detection_tween_factory')
     config.add_tween('rhodecode.tweens.sanity_check_factory')
+
+    # This needs to be the LAST item
+    config.add_tween('rhodecode.lib.middleware.request_wrapper.RequestWrapperTween')