Proxito: don't require the middleware for proxied apis

readthedocs/analytics/tests.py

@@ -8,7 +8,7 @@
 
 from readthedocs.builds.models import Version
 from readthedocs.projects.constants import PUBLIC
-from readthedocs.projects.models import Feature, Project
+from readthedocs.projects.models import Project
 
 from .models import PageView
 from .utils import anonymize_ip_address, anonymize_user_agent, get_client_ip

readthedocs/api/v2/proxied_urls.py

@@ -5,8 +5,7 @@
 so they can make use of features that require to have access to their cookies.
 """
 
-from django.conf import settings
-from django.conf.urls import include, url
+from django.conf.urls import url
 
 from readthedocs.analytics.proxied_api import AnalyticsView
 from readthedocs.api.v2.views.proxied import ProxiedEmbedAPI, ProxiedFooterHTML

readthedocs/proxito/middleware.py

@@ -126,6 +126,16 @@ class ProxitoMiddleware(MiddlewareMixin):
 
     """The actual middleware we'll be using in prod."""
 
+    # None of these need the proxito request middleware (response is needed).
+    # The analytics API isn't listed because it depends on the unresolver,
+    # which depends on the proxito middleware.
+    skip_views = (
+        'health_check',
+        'footer_html',
+        'search_api',
+        'embed_api',
+    )
+
     # pylint: disable=no-self-use
     def add_proxito_headers(self, request, response):
         """Add debugging and cache headers to proxito responses."""
@@ -167,12 +177,16 @@ def add_proxito_headers(self, request, response):
             response['X-RTD-Version-Method'] = 'path'
 
     def process_request(self, request):  # noqa
-        if any([
-            not settings.USE_SUBDOMAIN,
-            'localhost' in request.get_host(),
-            'testserver' in request.get_host(),
-            request.path.startswith(reverse('health_check')),
-        ]):
+        skip = any(
+            request.path.startswith(reverse(view))
+            for view in self.skip_views
+        )
+        if (
+            skip
+            or not settings.USE_SUBDOMAIN
+            or 'localhost' in request.get_host()
+            or 'testserver' in request.get_host()
+        ):
             log.debug('Not processing Proxito middleware')
             return None
 

readthedocs/rtd_tests/tests/test_footer.py

@@ -424,7 +424,7 @@ def test_highest_version_without_tags(self):
 class TestFooterPerformance(TestCase):
     # The expected number of queries for generating the footer
     # This shouldn't increase unless we modify the footer API
-    EXPECTED_QUERIES = 15
+    EXPECTED_QUERIES = 12
 
     def setUp(self):
         self.pip = get(