Fix faulty Celery bug fix cherry-pick #27691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

nedbat merged 2 commits into openedx:open-release/koa.master from open-craft:gabor/fix-koa-master

May 20, 2021

cms/djangoapps/contentstore/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/discussion/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/email_marketing/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/gating/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/grades/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/instructor_task/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

lms/djangoapps/verify_student/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

openedx/core/djangoapps/coursegraph/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

openedx/core/djangoapps/credentials/tasks/v1/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

openedx/core/djangoapps/programs/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

openedx/core/djangoapps/schedules/tasks.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@

requirements/edx/base.txt

-Original file line number
+Diff line change
@@ Expand Up @@
     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
@@ Expand Down @@

requirements/edx/development.txt

-Original file line number
+Diff line change
@@ Expand Up @@
     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
@@ Expand Down @@

requirements/edx/testing.txt

-Original file line number
+Diff line change
@@ Expand Up @@
     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
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix faulty Celery bug fix cherry-pick #27691

Uh oh!

Diff view

Diff view

There are no files selected for viewing