[django] minor renamings

Author: Emanuele Palazzetti

ddtrace/contrib/django/__init__.py

@@ -19,24 +19,24 @@
     )
 
 The configuration of this integration is all namespaced inside a single
-Django setting, named ``DATADOG_APM``. For example, your ``settings.py``
+Django setting, named ``DATADOG_TRACE``. For example, your ``settings.py``
 may contain::
 
-    DATADOG_APM = {
+    DATADOG_TRACE = {
         'DEFAULT_SERVICE': 'my-django-app',
     }
 
 If you need to access to the tracing settings, you should::
 
-    from ddtrace.contrib.django.conf import settings as dd_settings
+    from ddtrace.contrib.django.conf import settings
 
-    tracer = dd_settings.DEFAULT_TRACER
+    tracer = settings.TRACER
     tracer.trace("something")
     # your code ...
 
 The available settings are:
 
-* ``DEFAULT_TRACER`` (default ``ddtrace.tracer``): set the default tracer
+* ``TRACER`` (default ``ddtrace.tracer``): set the default tracer
   instance that is used to trace Django internals. By default the ``ddtrace``
   tracer is used.
 * ``DEFAULT_SERVICE`` (default: ``django``): set the service name used by the

ddtrace/contrib/django/apps.py

@@ -24,7 +24,7 @@ def ready(self):
         all Django internals are properly configured.
         """
         if settings.ENABLED:
-            tracer = settings.DEFAULT_TRACER
+            tracer = settings.TRACER
 
             # define the service details
             tracer.set_service_info(
@@ -33,10 +33,13 @@ def ready(self):
                 app_type=AppTypes.web,
             )
 
+            # trace Django internals
             try:
-                # trace Django internals
-                patch_template(tracer)
                 patch_db(tracer)
             except Exception:
-                # TODO[manu]: we can provide better details there
-                log.exception('error patching Django internals')
+                log.exception('error patching Django database connections')
+
+            try:
+                patch_template(tracer)
+            except Exception:
+                log.exception('error patching Django template rendering')

ddtrace/contrib/django/conf.py

@@ -1,9 +1,9 @@
 """
-Settings for Datadog tracer are all namespaced in the DATADOG_APM setting.
+Settings for Datadog tracer are all namespaced in the DATADOG_TRACE setting.
 For example your project's `settings.py` file might look like this:
 
-DATADOG_APM = {
-    'DEFAULT_TRACER': 'myapp.tracer',
+DATADOG_TRACE = {
+    'TRACER': 'myapp.tracer',
 }
 
 This module provides the `setting` object, that is used to access
@@ -19,18 +19,18 @@
 from django.test.signals import setting_changed
 
 
-USER_SETTINGS = getattr(django_settings, 'DATADOG_APM', None)
+USER_SETTINGS = getattr(django_settings, 'DATADOG_TRACE', None)
 
 # List of available settings with their defaults
 DEFAULTS = {
-    'DEFAULT_TRACER': 'ddtrace.tracer',
+    'TRACER': 'ddtrace.tracer',
     'DEFAULT_SERVICE': 'django',
     'ENABLED': not django_settings.DEBUG,
 }
 
 # List of settings that may be in string import notation.
 IMPORT_STRINGS = (
-    'DEFAULT_TRACER',
+    'TRACER',
 )
 
 # List of settings that have been removed
@@ -63,7 +63,7 @@ class DatadogSettings(object):
 
         from ddtrace.contrib.django.conf import settings
 
-        tracer = settings.DEFAULT_TRACER
+        tracer = settings.TRACER
 
     Any setting with string import paths will be automatically resolved
     and return the class, rather than the string literal.
@@ -77,7 +77,7 @@ def __init__(self, user_settings=None, defaults=None, import_strings=None):
     @property
     def user_settings(self):
         if not hasattr(self, '_user_settings'):
-            self._user_settings = getattr(settings, 'DATADOG_APM', {})
+            self._user_settings = getattr(settings, 'DATADOG_TRACE', {})
         return self._user_settings
 
     def __getattr__(self, attr):
@@ -118,7 +118,7 @@ def reload_settings(*args, **kwargs):
     """
     global settings
     setting, value = kwargs['setting'], kwargs['value']
-    if setting == 'DATADOG_APM':
+    if setting == 'DATADOG_TRACE':
         settings = DatadogSettings(value, DEFAULTS, IMPORT_STRINGS)
 
 

ddtrace/contrib/django/middleware.py

@@ -24,7 +24,7 @@ def __init__(self):
             raise MiddlewareNotUsed
 
     def process_request(self, request):
-        tracer = settings.DEFAULT_TRACER
+        tracer = settings.TRACER
 
         try:
             span = tracer.trace(

tests/contrib/django/app/settings.py

@@ -64,8 +64,8 @@
     'ddtrace.contrib.django',
 ]
 
-DATADOG_APM = {
+DATADOG_TRACE = {
     # tracer with a DummyWriter
-    'DEFAULT_TRACER': 'tests.contrib.django.utils.tracer',
+    'TRACER': 'tests.contrib.django.utils.tracer',
     'ENABLED': True,
 }

tests/contrib/django/utils.py

@@ -25,7 +25,7 @@ class DjangoTraceTestCase(TestCase):
     """
     def setUp(self):
         # assign the default tracer
-        self.tracer = settings.DEFAULT_TRACER
+        self.tracer = settings.TRACER
         # empty the tracer spans from previous operations
         # such as database creation queries
         self.tracer.writer.spans = []