|
19 | 19 | from django.test.signals import setting_changed |
20 | 20 |
|
21 | 21 |
|
22 | | -USER_SETTINGS = getattr(django_settings, 'DATADOG_TRACE', None) |
23 | | - |
24 | 22 | # List of available settings with their defaults |
25 | 23 | DEFAULTS = { |
26 | 24 | 'TRACER': 'ddtrace.tracer', |
27 | 25 | 'DEFAULT_SERVICE': 'django', |
28 | | - 'ENABLED': not django_settings.DEBUG, |
| 26 | + 'ENABLED': True, |
29 | 27 | } |
30 | 28 |
|
31 | 29 | # List of settings that may be in string import notation. |
@@ -77,7 +75,11 @@ def __init__(self, user_settings=None, defaults=None, import_strings=None): |
77 | 75 | @property |
78 | 76 | def user_settings(self): |
79 | 77 | if not hasattr(self, '_user_settings'): |
80 | | - self._user_settings = getattr(settings, 'DATADOG_TRACE', {}) |
| 78 | + self._user_settings = getattr(django_settings, 'DATADOG_TRACE', {}) |
| 79 | + |
| 80 | + # TODO[manu]: prevents docs import errors; provide a better implementation |
| 81 | + if 'ENABLED' not in self._user_settings: |
| 82 | + self._user_settings['ENABLED'] = not django_settings.DEBUG |
81 | 83 | return self._user_settings |
82 | 84 |
|
83 | 85 | def __getattr__(self, attr): |
@@ -109,7 +111,7 @@ def __check_user_settings(self, user_settings): |
109 | 111 | return user_settings |
110 | 112 |
|
111 | 113 |
|
112 | | -settings = DatadogSettings(USER_SETTINGS, DEFAULTS, IMPORT_STRINGS) |
| 114 | +settings = DatadogSettings(None, DEFAULTS, IMPORT_STRINGS) |
113 | 115 |
|
114 | 116 |
|
115 | 117 | def reload_settings(*args, **kwargs): |
|
0 commit comments