Add support for Django v4. (#451)

* Add support for Django v4

Co-authored-by: Tim Pansino <[email protected]>
Co-authored-by: Lalleh Rafeei <[email protected]>

* Update django and tastypie tests.

* Update tastypie test matrix.

* Fix typos.

* Install different versions of Django depending on tastypie/ Python version.

Co-authored-by: Tim Pansino <[email protected]>
Co-authored-by: Lalleh Rafeei <[email protected]>

Author: 3 people

newrelic/hooks/framework_django.py

@@ -547,7 +547,10 @@ def wrap_view_handler(wrapped, priority=3):
     if hasattr(wrapped, '_nr_django_view_handler'):
         return wrapped
 
-    name = callable_name(wrapped)
+    if hasattr(wrapped, "view_class"):
+        name = callable_name(wrapped.view_class)
+    else:
+        name = callable_name(wrapped)
 
     def wrapper(wrapped, instance, args, kwargs):
         transaction = current_transaction()
@@ -896,6 +899,20 @@ def instrument_django_views_debug(module):
             module.technical_500_response, priority=1)
 
 
+def resolve_view_handler(view, request):
+    # We can't intercept the delegated view handler when it
+    # is looked up by the dispatch() method so we need to
+    # duplicate the lookup mechanism.
+
+    if request.method.lower() in view.http_method_names:
+        handler = getattr(view, request.method.lower(),
+                view.http_method_not_allowed)
+    else:
+        handler = view.http_method_not_allowed
+
+    return handler
+
+
 def wrap_view_dispatch(wrapped):
 
     # Wrapper to be applied to dispatcher for class based views.
@@ -912,15 +929,7 @@ def _args(request, *args, **kwargs):
         view = instance
         request = _args(*args, **kwargs)
 
-        # We can't intercept the delegated view handler when it
-        # is looked up by the dispatch() method so we need to
-        # duplicate the lookup mechanism.
-
-        if request.method.lower() in view.http_method_names:
-            handler = getattr(view, request.method.lower(),
-                    view.http_method_not_allowed)
-        else:
-            handler = view.http_method_not_allowed
+        handler = resolve_view_handler(view, request)
 
         name = callable_name(handler)
 

tests/component_tastypie/test_application.py

@@ -16,6 +16,8 @@
 import six
 import webtest
 
+from tastypie import VERSION
+
 from newrelic.api.background_task import background_task
 from newrelic.api.transaction import end_of_transaction
 
@@ -64,7 +66,6 @@ def __exit__(self, *args, **kwargs):
 
 _test_api_base_scoped_metrics = [
         ('Function/django.core.handlers.wsgi:WSGIHandler.__call__', 1),
-        ('Function/django.urls.resolvers:RegexURLResolver.resolve', 1),
         ('Python/WSGI/Application', 1),
         ('Python/WSGI/Response', 1),
         ('Python/WSGI/Finalize', 1),
@@ -77,6 +78,13 @@ def __exit__(self, *args, **kwargs):
     _test_api_base_scoped_metrics.append(
             ('Function/tastypie.resources:wrapper', 1))
 
+# django < 1.12 used the RegexURLResolver class and this was updated to URLResolver in later versions
+if VERSION <= (0, 14, 3) and not six.PY3:
+    _test_api_base_scoped_metrics.append(('Function/django.urls.resolvers:RegexURLResolver.resolve', 1))
+else:
+    _test_api_base_scoped_metrics.append(('Function/django.urls.resolvers:URLResolver.resolve', 1))
+
+
 _test_application_not_found_scoped_metrics = list(
         _test_api_base_scoped_metrics)
 

tox.ini

@@ -60,7 +60,8 @@ envlist =
     python-component_djangorestframework-py27-djangorestframework0300,
     python-component_djangorestframework-{py36,py37,py38,py39,py310}-djangorestframeworklatest,
     python-component_flask_rest-{py27,py36,py37,py38,py39,pypy,pypy3},
-    python-component_tastypie-{py27,py36,py37,py38,py39,pypy,pypy3},
+    python-component_tastypie-{py27,pypy}-tastypie0143,
+    python-component_tastypie-{py36,py37,py38,py39,pypy3}-tastypie{0143,latest},
     python-coroutines_asyncio-{py36,py37,py38,py39,py310,pypy3},
     python-cross_agent-{py27,py36,py37,py38,py39,py310}-{with,without}_extensions,
     python-cross_agent-pypy-without_extensions,
@@ -107,9 +108,7 @@ envlist =
     python-framework_cherrypy-pypy3-CherryPy0303,
     python-framework_django-{pypy,py27}-Django0103,
     python-framework_django-{pypy,py27,py37}-Django0108,
-    ;temporarily disabling Django latest tests until v4 support is added to agent
-    ; python-framework_django-{py39}-Django{0200,0201,0202,0300,0301,latest},
-    python-framework_django-{py39}-Django{0200,0201,0202,0300,0301},
+    python-framework_django-{py39}-Django{0200,0201,0202,0300,0301,latest},
     python-framework_django-{py36,py37,py38,py39,py310}-Django0302,
     python-framework_falcon-{py27,py36,py37,py38,py39,pypy,pypy3}-falcon0103,
     python-framework_falcon-{py36,py37,py38,py39,py310,pypy3}-falcon{0200,master},
@@ -181,8 +180,11 @@ deps =
     component_flask_rest: flask-restful
     component_flask_rest: flask-restplus
     component_flask_rest: flask-restx
-    component_tastypie: django-tastypie<0.15
-    component_tastypie: django<1.12
+    component_tastypie-tastypie0143: django-tastypie<0.14.4
+    component_tastypie-{py27,pypy}-tastypie0143: django<1.12
+    component_tastypie-{py36,py37,py38,py39,pypy3}-tastypie0143: django<3.0.1
+    component_tastypie-tastypielatest: django-tastypie
+    component_tastypie-tastypielatest: django
     coroutines_asyncio: uvloop
     cross_agent: mock==1.0.1
     cross_agent: requests