Merge pull request #415 from sciyoshi/master

Django 2.0 compatibility: User.is_authenticated is now a property

Author: Emanuele Palazzetti

.circleci/config.yml

@@ -299,12 +299,18 @@ jobs:
       - run: tox -e '{py27,py34,py35,py36}-django{18,19,110,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached' --result-json /tmp/django.1.results
       - run: tox -e '{py27,py34,py35,py36}-django-autopatch{18,19,110,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached' --result-json /tmp/django.2.results
       - run: tox -e '{py27,py34,py35,py36}-django-drf{110,111}-djangorestframework{34,35,36,37}' --result-json /tmp/django.3.results
+      - run: tox -e '{py34,py35,py36}-django{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached' --result-json /tmp/django.4.results
+      - run: tox -e '{py34,py35,py36}-django-autopatch{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached' --result-json /tmp/django.5.results
+      - run: tox -e '{py34,py35,py36}-django-drf{200}-djangorestframework{37}' --result-json /tmp/django.6.results
       - persist_to_workspace:
           root: /tmp
           paths:
             - django.1.results
             - django.2.results
             - django.3.results
+            - django.4.results
+            - django.5.results
+            - django.6.results
       - save_cache:
           key: tox-cache-django-{{ checksum "tox.ini" }}
           paths:

ddtrace/contrib/django/compat.py

@@ -0,0 +1,9 @@
+import django
+
+
+if django.VERSION >= (2,):
+    def user_is_authenticated(user):
+        return user.is_authenticated
+else:
+    def user_is_authenticated(user):
+        return user.is_authenticated()

ddtrace/contrib/django/middleware.py

@@ -2,6 +2,7 @@
 
 # project
 from .conf import settings
+from .compat import user_is_authenticated
 
 from ...ext import http
 from ...contrib import func_name
@@ -134,7 +135,7 @@ def _set_auth_tags(span, request):
         return span
 
     if hasattr(user, 'is_authenticated'):
-        span.set_tag('django.user.is_authenticated', user.is_authenticated())
+        span.set_tag('django.user.is_authenticated', user_is_authenticated(user))
 
     uid = getattr(user, 'pk', None)
     if uid:

tests/contrib/django/app/settings.py

@@ -69,7 +69,7 @@
     },
 ]
 
-if django.VERSION >= (1, 10):
+if (1, 10) <= django.VERSION < (2, 0):
     MIDDLEWARE = [
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.middleware.common.CommonMiddleware',
@@ -82,6 +82,21 @@
 
         'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
     ]
+
+# Django 2.0 has different defaults
+if django.VERSION >= (2, 0):
+    MIDDLEWARE = [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+
+        'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
+    ]
+
 # Always add the legacy conf to make sure we handle it properly
 # Pre 1.10 style
 MIDDLEWARE_CLASSES = [

tests/contrib/django/compat.py

@@ -0,0 +1,4 @@
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:
+    from django.urls import reverse

tests/contrib/django/test_cache_views.py

@@ -3,9 +3,8 @@
 # 3rd party
 from nose.tools import eq_, ok_
 
-from django.core.urlresolvers import reverse
-
 # testing
+from .compat import reverse
 from .utils import DjangoTraceTestCase
 
 

tests/contrib/django/test_middleware.py

@@ -2,14 +2,14 @@
 from nose.tools import eq_
 
 from django.test import modify_settings
-from django.core.urlresolvers import reverse
 
 # project
 from ddtrace.constants import SAMPLING_PRIORITY_KEY
 from ddtrace.contrib.django.conf import settings
 from ddtrace.contrib.django import TraceMiddleware
 
 # testing
+from .compat import reverse
 from .utils import DjangoTraceTestCase, override_ddtrace_settings
 
 

tests/contrib/djangorestframework/app/settings.py

@@ -55,6 +55,20 @@
         'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
     ]
 
+# Django 2.0 has different defaults
+if django.VERSION >= (2, 0):
+    MIDDLEWARE = [
+        'django.contrib.sessions.middleware.SessionMiddleware',
+        'django.middleware.common.CommonMiddleware',
+        'django.middleware.csrf.CsrfViewMiddleware',
+        'django.contrib.auth.middleware.AuthenticationMiddleware',
+        'django.contrib.messages.middleware.MessageMiddleware',
+        'django.middleware.clickjacking.XFrameOptionsMiddleware',
+        'django.middleware.security.SecurityMiddleware',
+
+        'tests.contrib.django.app.middlewares.CatchExceptionMiddleware',
+    ]
+
 # Always add the legacy conf to make sure we handle it properly
 # Pre 1.10 style
 MIDDLEWARE_CLASSES = [

tox.ini

@@ -39,8 +39,11 @@ envlist =
     {py27,py34,py35,py36}-falcon{10,11,12}
     {py27,py34,py35,py36}-falcon-autopatch{10,11,12}
     {py27,py34,py35,py36}-django{18,19,110,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
+    {py34,py35,py36}-django{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
     {py27,py34,py35,py36}-django-autopatch{18,19,110,111}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
+    {py34,py35,py36}-django-autopatch{200}-djangopylibmc06-djangoredis45-pylibmc-redis{210}-memcached
     {py27,py34,py35,py36}-django-drf{110,111}-djangorestframework{34,35,36,37}
+    {py34,py35,py36}-django-drf{200}-djangorestframework{37}
     {py27,py34,py35,py36}-flask{010,011,012}-blinker
     {py27,py34,py35,py36}-flask-autopatch{010,011,012}-blinker
     {py27,py34,py35,py36}-flask{010,011,012}-flaskcache{013}-memcached-redis{210}-blinker
@@ -137,12 +140,15 @@ deps =
     django19: django>=1.9,<1.10
     django110: django>=1.10,<1.11
     django111: django>=1.11,<1.12
+    django200: django>=2.0,<2.1
     django-autopatch18: django>=1.8,<1.9
     django-autopatch19: django>=1.9,<1.10
     django-autopatch110: django>=1.10,<1.11
     django-autopatch111: django>=1.11,<1.12
+    django-autopatch200: django>=2.0,<2.1
     django-drf110: django>=1.10,<1.11
     django-drf111: django>=1.11,<1.12
+    django-drf200: django>=2.0,<2.1
     djangopylibmc06: django-pylibmc>=0.6,<0.7
     djangoredis45: django-redis>=4.5,<4.6
     djangorestframework34: djangorestframework>=3.4,<3.5
@@ -240,9 +246,9 @@ commands =
     cassandra{35,36,37,38}: nosetests {posargs} tests/contrib/cassandra
     celery{31,40}: nosetests {posargs} tests/contrib/celery
     elasticsearch{16,17,18,23,24,25,51,52,53,54}: nosetests {posargs} tests/contrib/elasticsearch
-    django{18,19,110,111}: python tests/contrib/django/runtests.py {posargs}
-    django-autopatch{18,19,110,111}: ddtrace-run python tests/contrib/django/runtests.py {posargs}
-    django-drf{110,111}: python tests/contrib/djangorestframework/runtests.py {posargs}
+    django{18,19,110,111,200}: python tests/contrib/django/runtests.py {posargs}
+    django-autopatch{18,19,110,111,200}: ddtrace-run python tests/contrib/django/runtests.py {posargs}
+    django-drf{110,111,200}: python tests/contrib/djangorestframework/runtests.py {posargs}
     flaskcache{012,013}: nosetests {posargs} tests/contrib/flask_cache
     flask{010,011,012}: nosetests {posargs} tests/contrib/flask
     flask-autopatch{010,011,012}: ddtrace-run nosetests {posargs} tests/contrib/flask_autopatch
@@ -399,6 +405,9 @@ setenv =
 setenv =
     {[django_autopatch]setenv}
 [testenv:py27-django-autopatch110-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
+setenv =
+    {[django_autopatch]setenv}
+[testenv:py27-django-autopatch111-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
 setenv =
     {[django_autopatch]setenv}
 [testenv:py34-django-autopatch18-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
@@ -408,6 +417,12 @@ setenv =
 setenv =
     {[django_autopatch]setenv}
 [testenv:py34-django-autopatch110-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
+setenv =
+    {[django_autopatch]setenv}
+[testenv:py34-django-autopatch111-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
+setenv =
+    {[django_autopatch]setenv}
+[testenv:py34-django-autopatch200-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
 setenv =
     {[django_autopatch]setenv}
 [testenv:py35-django-autopatch18-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
@@ -420,6 +435,9 @@ setenv =
 setenv =
     {[django_autopatch]setenv}
 [testenv:py35-django-autopatch111-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
+setenv =
+    {[django_autopatch]setenv}
+[testenv:py35-django-autopatch200-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
 setenv =
     {[django_autopatch]setenv}
 [testenv:py36-django-autopatch18-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
@@ -432,6 +450,9 @@ setenv =
 setenv =
     {[django_autopatch]setenv}
 [testenv:py36-django-autopatch111-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
+setenv =
+    {[django_autopatch]setenv}
+[testenv:py36-django-autopatch200-djangopylibmc06-djangoredis45-pylibmc-redis-memcached]
 setenv =
     {[django_autopatch]setenv}