diff --git a/cms/djangoapps/contentstore/tasks.py b/cms/djangoapps/contentstore/tasks.py index 6f87de0c4260..0447c8189126 100644 --- a/cms/djangoapps/contentstore/tasks.py +++ b/cms/djangoapps/contentstore/tasks.py @@ -22,6 +22,7 @@ from django.test import RequestFactory from django.utils.text import get_valid_filename from django.utils.translation import ugettext as _ +from edx_django_utils.monitoring import set_code_owner_attribute from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.locator import LibraryLocator from organizations.models import OrganizationCourse diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py index 596625d02b2c..843c06211ce6 100644 --- a/lms/djangoapps/discussion/tasks.py +++ b/lms/djangoapps/discussion/tasks.py @@ -15,6 +15,7 @@ from edx_ace import ace from edx_ace.recipient import Recipient from edx_ace.utils import date +from edx_django_utils.monitoring import set_code_owner_attribute from eventtracking import tracker from opaque_keys.edx.keys import CourseKey from six.moves.urllib.parse import urljoin diff --git a/lms/djangoapps/email_marketing/tasks.py b/lms/djangoapps/email_marketing/tasks.py index 57dbd30f8966..fb5c50a8f5c7 100644 --- a/lms/djangoapps/email_marketing/tasks.py +++ b/lms/djangoapps/email_marketing/tasks.py @@ -13,6 +13,7 @@ from django.core.cache import cache from sailthru.sailthru_client import SailthruClient from sailthru.sailthru_error import SailthruClientError +from edx_django_utils.monitoring import set_code_owner_attribute from .models import EmailMarketingConfiguration diff --git a/lms/djangoapps/gating/tasks.py b/lms/djangoapps/gating/tasks.py index b58b27b89050..35ce1ee5d932 100644 --- a/lms/djangoapps/gating/tasks.py +++ b/lms/djangoapps/gating/tasks.py @@ -8,6 +8,7 @@ import six from celery import task from django.contrib.auth.models import User +from edx_django_utils.monitoring import set_code_owner_attribute from opaque_keys.edx.keys import CourseKey, UsageKey from lms.djangoapps.gating import api as gating_api diff --git a/lms/djangoapps/grades/tasks.py b/lms/djangoapps/grades/tasks.py index b1d737ec4c62..e159cfb335d7 100644 --- a/lms/djangoapps/grades/tasks.py +++ b/lms/djangoapps/grades/tasks.py @@ -12,7 +12,7 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db.utils import DatabaseError -from edx_django_utils.monitoring import set_custom_attribute, set_custom_attributes_for_course_key +from edx_django_utils.monitoring import set_custom_attribute, set_custom_attributes_for_course_key, set_code_owner_attribute from opaque_keys.edx.keys import CourseKey, UsageKey from opaque_keys.edx.locator import CourseLocator from submissions import api as sub_api diff --git a/lms/djangoapps/instructor_task/tasks.py b/lms/djangoapps/instructor_task/tasks.py index 275997f5c6d9..e393252ac103 100644 --- a/lms/djangoapps/instructor_task/tasks.py +++ b/lms/djangoapps/instructor_task/tasks.py @@ -26,6 +26,7 @@ from celery import task from django.conf import settings from django.utils.translation import ugettext_noop +from edx_django_utils.monitoring import set_code_owner_attribute from lms.djangoapps.bulk_email.tasks import perform_delegate_email_batches from lms.djangoapps.instructor_task.tasks_base import BaseInstructorTask diff --git a/lms/djangoapps/verify_student/tasks.py b/lms/djangoapps/verify_student/tasks.py index b11aebfd289c..bbebef820008 100644 --- a/lms/djangoapps/verify_student/tasks.py +++ b/lms/djangoapps/verify_student/tasks.py @@ -11,6 +11,7 @@ from celery.states import FAILURE from django.conf import settings from django.core.mail import EmailMessage +from edx_django_utils.monitoring import set_code_owner_attribute from common.djangoapps.edxmako.shortcuts import render_to_string from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers diff --git a/openedx/core/djangoapps/coursegraph/tasks.py b/openedx/core/djangoapps/coursegraph/tasks.py index 4ea1d54e9ca5..3eec402497eb 100644 --- a/openedx/core/djangoapps/coursegraph/tasks.py +++ b/openedx/core/djangoapps/coursegraph/tasks.py @@ -10,6 +10,7 @@ from django.conf import settings from django.utils import six, timezone from edx_django_utils.cache import RequestCache +from edx_django_utils.monitoring import set_code_owner_attribute from opaque_keys.edx.keys import CourseKey from py2neo import Graph, Node, Relationship, authenticate, NodeSelector from py2neo.compat import integer, string diff --git a/openedx/core/djangoapps/credentials/tasks/v1/tasks.py b/openedx/core/djangoapps/credentials/tasks/v1/tasks.py index 5f0cc68ed0b8..007fc5150a8f 100644 --- a/openedx/core/djangoapps/credentials/tasks/v1/tasks.py +++ b/openedx/core/djangoapps/credentials/tasks/v1/tasks.py @@ -8,6 +8,7 @@ from django.conf import settings from django.contrib.auth.models import User from opaque_keys.edx.keys import CourseKey +from edx_django_utils.monitoring import set_code_owner_attribute from openedx.core.djangoapps.credentials.utils import get_credentials_api_client diff --git a/openedx/core/djangoapps/programs/tasks.py b/openedx/core/djangoapps/programs/tasks.py index 84cf56dd0fab..9215bda3a526 100644 --- a/openedx/core/djangoapps/programs/tasks.py +++ b/openedx/core/djangoapps/programs/tasks.py @@ -10,6 +10,7 @@ from django.contrib.auth.models import User from django.contrib.sites.models import Site from edx_rest_api_client import exceptions +from edx_django_utils.monitoring import set_code_owner_attribute from opaque_keys.edx.keys import CourseKey from common.djangoapps.course_modes.models import CourseMode diff --git a/openedx/core/djangoapps/schedules/tasks.py b/openedx/core/djangoapps/schedules/tasks.py index 8c6fd76cf26a..3f2dccbf9d02 100644 --- a/openedx/core/djangoapps/schedules/tasks.py +++ b/openedx/core/djangoapps/schedules/tasks.py @@ -16,7 +16,7 @@ from edx_ace import ace from edx_ace.message import Message from edx_ace.utils.date import deserialize, serialize -from edx_django_utils.monitoring import set_custom_attribute +from edx_django_utils.monitoring import set_custom_attribute, set_code_owner_attribute from eventtracking import tracker from opaque_keys.edx.keys import CourseKey diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index fedb1751b38c..fc5b5e869499 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -97,7 +97,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/base.in, super-csv edx-completion==3.2.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-django-release-util==0.4.4 # via -r requirements/edx/base.in edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.in -edx-django-utils==3.11.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when +edx-django-utils==3.12.0 # via -r requirements/edx/base.in, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/base.in, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.11.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in edx-i18n-tools==0.5.3 # via ora2 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index c94d28bc27f0..b2ffc40ab82e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -108,7 +108,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/testing.txt, super-csv edx-completion==3.2.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-django-release-util==0.4.4 # via -r requirements/edx/testing.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/testing.txt -edx-django-utils==3.11.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when +edx-django-utils==3.12.0 # via -r requirements/edx/testing.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/testing.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.11.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/testing.txt, ora2 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index ae5e6bc8a23f..51163b469e93 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -105,7 +105,7 @@ edx-celeryutils==0.5.2 # via -r requirements/edx/base.txt, super-csv edx-completion==3.2.5 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-django-release-util==0.4.4 # via -r requirements/edx/base.txt edx-django-sites-extensions==2.5.1 # via -r requirements/edx/base.txt -edx-django-utils==3.11.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when +edx-django-utils==3.12.0 # via -r requirements/edx/base.txt, django-config-models, edx-drf-extensions, edx-enterprise, edx-rest-api-client, edx-toggles, edx-when edx-drf-extensions==6.2.0 # via -r requirements/edx/base.txt, edx-completion, edx-enterprise, edx-organizations, edx-proctoring, edx-rbac, edx-when, edxval edx-enterprise==3.11.1 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt edx-i18n-tools==0.5.3 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, ora2