Merge pull request #18725 from edx/robrap/ARCH-193-update-edx-platform

ARCH-193: Add metrics for requests.

cms/envs/common.py

@@ -471,6 +471,10 @@ XQUEUE_INTERFACE = {
 
 MIDDLEWARE_CLASSES = [
     'crum.CurrentRequestUserMiddleware',
+
+    # Clears request cache. This is a safer request cache.
+    'edx_django_utils.cache.middleware.RequestCacheMiddleware',
+
     'openedx.core.djangoapps.request_cache.middleware.RequestCache',
 
     'openedx.core.djangoapps.monitoring_utils.middleware.MonitoringMemoryMiddleware',
@@ -525,6 +529,12 @@ MIDDLEWARE_CLASSES = [
 
     'waffle.middleware.WaffleMiddleware',
 
+    # Enables force_django_cache_miss functionality for TieredCache.
+    'edx_django_utils.cache.middleware.TieredCacheMiddleware',
+
+    # Outputs monitoring metrics for a request.
+    'edx_rest_framework_extensions.middleware.RequestMetricsMiddleware',
+
     'edx_rest_framework_extensions.middleware.EnsureJWTAuthSettingsMiddleware',
 
     # This must be last so that it runs first in the process_response chain

lms/envs/common.py

@@ -1217,6 +1217,9 @@ CREDIT_NOTIFICATION_CACHE_TIMEOUT = 5 * 60 * 60
 MIDDLEWARE_CLASSES = [
     'crum.CurrentRequestUserMiddleware',
 
+    # Clears request cache. This is a safer request cache.
+    'edx_django_utils.cache.middleware.RequestCacheMiddleware',
+
     'openedx.core.djangoapps.request_cache.middleware.RequestCache',
     'openedx.core.djangoapps.monitoring_utils.middleware.MonitoringCustomMetrics',
 
@@ -1296,6 +1299,12 @@ MIDDLEWARE_CLASSES = [
     # Inserts Enterprise content.
     'openedx.features.enterprise_support.middleware.EnterpriseMiddleware',
 
+    # Enables force_django_cache_miss functionality for TieredCache.
+    'edx_django_utils.cache.middleware.TieredCacheMiddleware',
+
+    # Outputs monitoring metrics for a request.
+    'edx_rest_framework_extensions.middleware.RequestMetricsMiddleware',
+
     'edx_rest_framework_extensions.middleware.EnsureJWTAuthSettingsMiddleware',
 
     # This must be last

requirements/edx/base.in

@@ -69,10 +69,11 @@ edx-analytics-data-api-client
 edx-ccx-keys
 edx-celeryutils
 edx-completion
-edx-django-release-util             # Release utils for the edx release pipeline
-edx-drf-extensions
 edx-django-oauth2-provider==1.3.4
+edx-django-release-util             # Release utils for the edx release pipeline
 edx-django-sites-extensions==2.3.1
+edx-django-utils
+edx-drf-extensions
 edx-enterprise
 edx-milestones
 edx-oauth2-provider

requirements/edx/base.txt

@@ -115,7 +115,7 @@ edx-completion==0.1.8
 edx-django-oauth2-provider==1.3.4
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==0.3.0   # via edx-drf-extensions
+edx-django-utils==0.4.1
 edx-drf-extensions==1.6.1
 edx-enterprise==0.72.5
 edx-i18n-tools==0.4.6

requirements/edx/development.txt

@@ -135,7 +135,7 @@ edx-completion==0.1.8
 edx-django-oauth2-provider==1.3.4
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==0.3.0
+edx-django-utils==0.4.1
 edx-drf-extensions==1.6.1
 edx-enterprise==0.72.5
 edx-i18n-tools==0.4.6

requirements/edx/testing.txt

@@ -130,7 +130,7 @@ edx-completion==0.1.8
 edx-django-oauth2-provider==1.3.4
 edx-django-release-util==0.3.1
 edx-django-sites-extensions==2.3.1
-edx-django-utils==0.3.0
+edx-django-utils==0.4.1
 edx-drf-extensions==1.6.1
 edx-enterprise==0.72.5
 edx-i18n-tools==0.4.6