Merge pull request #1257 from zhammer/patch-1

Use DATADOG_SERVICE_NAME environment variable as default tornado service name

Author: Kyle-Verhoog

ddtrace/contrib/tornado/__init__.py

@@ -92,7 +92,8 @@ def log_exception(self, typ, value, tb):
 The available settings are:
 
 * ``default_service`` (default: `tornado-web`): set the service name used by the tracer. Usually
-  this configuration must be updated with a meaningful name.
+  this configuration must be updated with a meaningful name. Can also be configured via the
+  ``DATADOG_SERVICE_NAME`` environment variable.
 * ``tags`` (default: `{}`): set global tags that should be applied to all spans.
 * ``enabled`` (default: `True`): define if the tracer is enabled or not. If set to `false`, the
   code is still instrumented but no spans are sent to the APM agent.

ddtrace/contrib/tornado/application.py

@@ -1,3 +1,5 @@
+import os
+
 import ddtrace
 
 from tornado import template
@@ -17,7 +19,7 @@ def tracer_config(__init__, app, args, kwargs):
     # default settings
     settings = {
         'tracer': ddtrace.tracer,
-        'default_service': 'tornado-web',
+        'default_service': os.getenv('DATADOG_SERVICE_NAME', 'tornado-web'),
         'distributed_tracing': True,
         'analytics_enabled': None
     }