Merge pull request openedx#476 from timmc-edx/timmc/no-direct-nr

fix: Use edx-django-utils API instead of calling newrelic directly

Author: sarina

notesapi/v1/views/common.py

@@ -1,12 +1,13 @@
 #  pylint:disable=possibly-used-before-assignment
 import json
 import logging
-import newrelic.agent
+
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.db.models import Q
 from django.urls import reverse
 from django.utils.translation import gettext as _
+from edx_django_utils.monitoring import set_custom_attribute
 from rest_framework import status
 from rest_framework.generics import GenericAPIView, ListAPIView
 from rest_framework.response import Response
@@ -398,8 +399,7 @@ def post(self, *args, **kwargs):
             note = Note.create(self.request.data)
             note.full_clean()
 
-            # Gather metrics for New Relic so we can slice data in New Relic Insights
-            newrelic.agent.add_custom_parameter("notes.count", total_notes)
+            set_custom_attribute("notes.count", total_notes)
         except ValidationError as error:
             log.debug(error, exc_info=True)
             return Response(status=status.HTTP_400_BAD_REQUEST)

notesserver/views.py

@@ -4,16 +4,12 @@
 from django.db import connection
 from django.http import JsonResponse
 from django.http import HttpResponse
+from edx_django_utils.monitoring import ignore_transaction
 from rest_framework import status
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import AllowAny
 from rest_framework.response import Response
 
-try:
-    import newrelic.agent
-except ImportError:  # pragma: no cover
-    newrelic = None  # pylint: disable=invalid-name
-
 from notesapi.v1.views import get_annotation_search_view_class
 from notesapi.v1.views import SearchViewRuntimeError
 
@@ -45,8 +41,7 @@ def heartbeat(request):
     """
     ElasticSearch and database are reachable and ready to handle requests.
     """
-    if newrelic:  # pragma: no cover
-        newrelic.agent.ignore_transaction()
+    ignore_transaction()  # no need to record telemetry for heartbeats
     try:
         db_status()
     except Exception:  # pylint: disable=broad-exception-caught

requirements/base.in

@@ -16,7 +16,6 @@ PyJWT
 gunicorn     # MIT
 path.py
 python-dateutil
-newrelic
 edx-django-release-util
 edx-django-utils
 edx-drf-extensions

requirements/base.txt

@@ -109,9 +109,7 @@ meilisearch==0.34.0
 mysqlclient==2.2.7
     # via -r requirements/base.in
 newrelic==10.7.0
-    # via
-    #   -r requirements/base.in
-    #   edx-django-utils
+    # via edx-django-utils
 packaging==24.2
     # via
     #   django-nine