Merge pull request #23025 from edx/diana/remove-sql-track-flag

Remove ENABLE_SQL_TRACKING_LOGS and all associated code.

cms/djangoapps/contentstore/tests/test_request_event.py

@@ -1,7 +1,6 @@
 """Tests for CMS's requests to logs"""
 
 
-import mock
 from django.test import TestCase
 from django.urls import reverse
 from six import unichr  # pylint: disable=W0622
@@ -23,10 +22,9 @@ class CMSLogTest(TestCase):
             {"event": "my_event", "event_type": "my_event_type", "page": "my_page"},
             {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}  # pylint: disable=unicode-format-string
         ]
-        with mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_SQL_TRACKING_LOGS': True}):
-            for request_params in requests:
-                response = self.client.post(reverse(cms_user_track), request_params)
-                self.assertEqual(response.status_code, 204)
+        for request_params in requests:
+            response = self.client.post(reverse(cms_user_track), request_params)
+            self.assertEqual(response.status_code, 204)
 
     def test_get_answers_to_log(self):
         """
@@ -35,9 +33,8 @@ class CMSLogTest(TestCase):
         """
         requests = [
             {"event": "my_event", "event_type": "my_event_type", "page": "my_page"},
-            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}  # pylint: disable=unicode-format-string
+            {"event": "{'json': 'object'}", "event_type": unichr(512), "page": "my_page"}
         ]
-        with mock.patch.dict('django.conf.settings.FEATURES', {'ENABLE_SQL_TRACKING_LOGS': True}):
-            for request_params in requests:
-                response = self.client.get(reverse(cms_user_track), request_params)
-                self.assertEqual(response.status_code, 204)
+        for request_params in requests:
+            response = self.client.get(reverse(cms_user_track), request_params)
+            self.assertEqual(response.status_code, 204)

common/djangoapps/track/urls.py

@@ -13,9 +13,3 @@ urlpatterns = [
     url(r'^event$', track.views.user_track),
     url(r'^segmentio/event$', track.views.segmentio.segmentio_event),
 ]
-
-if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
-    urlpatterns += [
-        url(r'^event_logs$', track.views.view_tracking_log),
-        url(r'^event_logs/(?P<args>.+)$', track.views.view_tracking_log),
-    ]

lms/envs/common.py

@@ -108,7 +108,6 @@ FEATURES = {
     'ENABLE_DISCUSSION_EMAIL_DIGEST': False,
 
     'ENABLE_DJANGO_ADMIN_SITE': True,  # set true to enable django's admin site, even on prod (e.g. for course ops)
-    'ENABLE_SQL_TRACKING_LOGS': False,
     'ENABLE_LMS_MIGRATION': False,
 
     'ENABLE_MASQUERADE': True,  # allow course staff to change to student view of courseware
@@ -897,20 +896,6 @@ EVENT_TRACKING_BACKENDS = {
 EVENT_TRACKING_PROCESSORS = []
 EVENT_TRACKING_SEGMENTIO_EMIT_WHITELIST = []
 
-# Backwards compatibility with ENABLE_SQL_TRACKING_LOGS feature flag.
-# In the future, adding the backend to TRACKING_BACKENDS should be enough.
-if FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
-    TRACKING_BACKENDS.update({
-        'sql': {
-            'ENGINE': 'track.backends.django.DjangoBackend'
-        }
-    })
-    EVENT_TRACKING_BACKENDS.update({
-        'sql': {
-            'ENGINE': 'track.backends.django.DjangoBackend'
-        }
-    })
-
 TRACKING_SEGMENTIO_WEBHOOK_SECRET = None
 TRACKING_SEGMENTIO_ALLOWED_TYPES = ['track']
 TRACKING_SEGMENTIO_DISALLOWED_SUBSTRING_NAMES = []

lms/urls.py

@@ -51,7 +51,6 @@ from openedx.features.enterprise_support.api import enterprise_enabled
 from static_template_view import views as static_template_view_views
 from staticbook import views as staticbook_views
 from student import views as student_views
-from track import views as track_views
 from util import views as util_views
 
 if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
@@ -833,11 +832,6 @@ if settings.FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
         url(r'^_o/', include(('oauth2_provider.urls', 'edx_oauth2_provider'), namespace='oauth2_provider')),
     ]
 
-if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
-    urlpatterns += [
-        url(r'^event_logs$', track_views.view_tracking_log),
-        url(r'^event_logs/(?P<args>.+)$', track_views.view_tracking_log),
-    ]
 
 if settings.FEATURES.get('ENABLE_SERVICE_STATUS'):
     urlpatterns += [