Skip to content

Commit 4856539

Browse files
authored
fix: Upgrade edx-django-utils, dropping newrelic; fix test and typo (#36799)
This upgrades edx-django-utils to a version that drops the newrelic dependency. However, I also needed to fix a test that was sensitive to the number of warnings that the code under test produced. With newrelic gone, there's an additional warning. - Fix test so that it isn't sensitive to unrelated warnings - Fix typo in warning For reference, this is the new warning: ``` "WARNING:edx_django_utils.monitoring.internal.backends:Could not load OPENEDX_TELEMETRY option 'edx_django_utils.monitoring.NewRelicBackend': Exception('Could not load New Relic monitoring backend; package not present.')" ``` This is expected due to edx-django-utils still defaulting to NR for telemetry. (Perhaps the subject of a future breaking change.)
1 parent c824903 commit 4856539

6 files changed

Lines changed: 6 additions & 22 deletions

File tree

openedx/core/djangoapps/user_authn/views/login.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ def _check_user_auth_flow(site, user):
421421
# we don't record their e-mail in case there is sensitive info accidentally
422422
# in there.
423423
set_custom_attribute("login_tpa_domain_shortcircuit_user_id", user.id)
424-
log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check.", user.id)
424+
log.warning("User %s has nonstandard e-mail. Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check.", user.id)
425425
return
426426
user_domain = email_parts[1].strip().lower()
427427

openedx/core/djangoapps/user_authn/views/tests/test_login.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1027,8 +1027,7 @@ def test_check_user_auth_flow_bad_email(self):
10271027

10281028
with self.assertLogs(level='WARN') as log:
10291029
_check_user_auth_flow(site, invalid_email_user)
1030-
assert len(log.output) == 1
1031-
assert "Shortcircuiting THIRD_PART_AUTH_ONLY_DOMAIN check." in log.output[0]
1030+
assert any("Shortcircuiting THIRD_PARTY_AUTH_ONLY_DOMAIN check." in warning for warning in log.output)
10321031

10331032

10341033
@ddt.ddt

requirements/edx/base.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ edx-django-release-util==1.5.0
431431
# edxval
432432
edx-django-sites-extensions==5.1.0
433433
# via -r requirements/edx/kernel.in
434-
edx-django-utils==7.4.0
434+
edx-django-utils==8.0.0
435435
# via
436436
# -r requirements/edx/kernel.in
437437
# django-config-models
@@ -756,8 +756,6 @@ mysqlclient==2.2.7
756756
# via
757757
# -r requirements/edx/kernel.in
758758
# openedx-forum
759-
newrelic==10.12.0
760-
# via edx-django-utils
761759
nh3==0.2.21
762760
# via -r requirements/edx/kernel.in
763761
nltk==3.9.1

requirements/edx/development.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ edx-django-sites-extensions==5.1.0
705705
# via
706706
# -r requirements/edx/doc.txt
707707
# -r requirements/edx/testing.txt
708-
edx-django-utils==7.4.0
708+
edx-django-utils==8.0.0
709709
# via
710710
# -r requirements/edx/doc.txt
711711
# -r requirements/edx/testing.txt
@@ -1286,11 +1286,6 @@ mysqlclient==2.2.7
12861286
# -r requirements/edx/doc.txt
12871287
# -r requirements/edx/testing.txt
12881288
# openedx-forum
1289-
newrelic==10.12.0
1290-
# via
1291-
# -r requirements/edx/doc.txt
1292-
# -r requirements/edx/testing.txt
1293-
# edx-django-utils
12941289
nh3==0.2.21
12951290
# via
12961291
# -r requirements/edx/doc.txt

requirements/edx/doc.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ edx-django-release-util==1.5.0
515515
# edxval
516516
edx-django-sites-extensions==5.1.0
517517
# via -r requirements/edx/base.txt
518-
edx-django-utils==7.4.0
518+
edx-django-utils==8.0.0
519519
# via
520520
# -r requirements/edx/base.txt
521521
# django-config-models
@@ -920,10 +920,6 @@ mysqlclient==2.2.7
920920
# via
921921
# -r requirements/edx/base.txt
922922
# openedx-forum
923-
newrelic==10.12.0
924-
# via
925-
# -r requirements/edx/base.txt
926-
# edx-django-utils
927923
nh3==0.2.21
928924
# via -r requirements/edx/base.txt
929925
nltk==3.9.1

requirements/edx/testing.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ edx-django-release-util==1.5.0
540540
# edxval
541541
edx-django-sites-extensions==5.1.0
542542
# via -r requirements/edx/base.txt
543-
edx-django-utils==7.4.0
543+
edx-django-utils==8.0.0
544544
# via
545545
# -r requirements/edx/base.txt
546546
# django-config-models
@@ -979,10 +979,6 @@ mysqlclient==2.2.7
979979
# via
980980
# -r requirements/edx/base.txt
981981
# openedx-forum
982-
newrelic==10.12.0
983-
# via
984-
# -r requirements/edx/base.txt
985-
# edx-django-utils
986982
nh3==0.2.21
987983
# via -r requirements/edx/base.txt
988984
nltk==3.9.1

0 commit comments

Comments
 (0)