Add Jaeger host/port settings (census-instrumentation#462)

* Add Jaeger host/port settings

* Restore transport param

* Add Jaeger agent/host settings to Flask middleware

* Fix settings params

* Add Jaeger host settings to README

Author: tpyo

README.rst

@@ -307,6 +307,10 @@ setting in ``settings.py``:
         'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
         'ZIPKIN_EXPORTER_PORT': 9411,
         'ZIPKIN_EXPORTER_PROTOCOL': 'http',
+        'JAEGER_EXPORTER_HOST_NAME': None,
+        'JAEGER_EXPORTER_PORT': None,
+        'JAEGER_EXPORTER_AGENT_HOST_NAME': 'localhost',
+        'JAEGER_EXPORTER_AGENT_PORT': 6831
     }
 
 

opencensus/trace/ext/django/middleware.py

@@ -44,6 +44,11 @@
 ZIPKIN_EXPORTER_HOST_NAME = 'ZIPKIN_EXPORTER_HOST_NAME'
 ZIPKIN_EXPORTER_PORT = 'ZIPKIN_EXPORTER_PORT'
 ZIPKIN_EXPORTER_PROTOCOL = 'ZIPKIN_EXPORTER_PROTOCOL'
+JAEGER_EXPORTER_HOST_NAME = 'JAEGER_EXPORTER_HOST_NAME'
+JAEGER_EXPORTER_PORT = 'JAEGER_EXPORTER_PORT'
+JAEGER_EXPORTER_AGENT_HOST_NAME = 'JAEGER_EXPORTER_AGENT_HOST_NAME'
+JAEGER_EXPORTER_AGENT_PORT = 'JAEGER_EXPORTER_AGENT_PORT'
+JAEGER_EXPORTER_SERVICE_NAME = 'JAEGER_EXPORTER_SERVICE_NAME'
 OCAGENT_TRACE_EXPORTER_ENDPOINT = 'OCAGENT_TRACE_EXPORTER_ENDPOINT'
 BLACKLIST_HOSTNAMES = 'BLACKLIST_HOSTNAMES'
 
@@ -155,9 +160,23 @@ def __init__(self, get_response=None):
                 endpoint=_endpoint,
                 transport=transport)
         elif self._exporter.__name__ == 'JaegerExporter':
-            _service_name = self._get_service_name(settings.params)
+            _service_name = settings.params.get(
+                JAEGER_EXPORTER_SERVICE_NAME,
+                self._get_service_name(settings.params))
+            _jaeger_host_name = settings.params.get(
+                JAEGER_EXPORTER_HOST_NAME, None)
+            _jaeger_port = settings.params.get(
+                JAEGER_EXPORTER_PORT, None)
+            _jaeger_agent_host_name = settings.params.get(
+                JAEGER_EXPORTER_AGENT_HOST_NAME, 'localhost')
+            _jaeger_agent_port = settings.params.get(
+                JAEGER_EXPORTER_AGENT_PORT, 6831)
             self.exporter = self._exporter(
                 service_name=_service_name,
+                host_name=_jaeger_host_name,
+                port=_jaeger_port,
+                agent_host_name=_jaeger_agent_host_name,
+                agent_port=_jaeger_agent_port,
                 transport=transport)
         else:
             self.exporter = self._exporter(transport=transport)

opencensus/trace/ext/flask/flask_middleware.py

@@ -40,13 +40,15 @@
 SAMPLING_RATE = 'SAMPLING_RATE'
 TRANSPORT = 'TRANSPORT'
 SERVICE_NAME = 'SERVICE_NAME'
-JAEGER_EXPORTER_SERVICE_NAME = 'JAEGER_EXPORTER_SERVICE_NAME'
-JAEGER_EXPORTER_HOST_NAME = 'JAEGER_EXPORTER_HOST_NAME'
-JAEGER_EXPORTER_PORT = 'JAEGER_EXPORTER_PORT'
 ZIPKIN_EXPORTER_SERVICE_NAME = 'ZIPKIN_EXPORTER_SERVICE_NAME'
 ZIPKIN_EXPORTER_HOST_NAME = 'ZIPKIN_EXPORTER_HOST_NAME'
 ZIPKIN_EXPORTER_PORT = 'ZIPKIN_EXPORTER_PORT'
 ZIPKIN_EXPORTER_PROTOCOL = 'ZIPKIN_EXPORTER_PROTOCOL'
+JAEGER_EXPORTER_HOST_NAME = 'JAEGER_EXPORTER_HOST_NAME'
+JAEGER_EXPORTER_PORT = 'JAEGER_EXPORTER_PORT'
+JAEGER_EXPORTER_AGENT_HOST_NAME = 'JAEGER_EXPORTER_AGENT_HOST_NAME'
+JAEGER_EXPORTER_AGENT_PORT = 'JAEGER_EXPORTER_AGENT_PORT'
+JAEGER_EXPORTER_SERVICE_NAME = 'JAEGER_EXPORTER_SERVICE_NAME'
 OCAGENT_TRACE_EXPORTER_ENDPOINT = 'OCAGENT_TRACE_EXPORTER_ENDPOINT'
 BLACKLIST_HOSTNAMES = 'BLACKLIST_HOSTNAMES'
 
@@ -140,15 +142,23 @@ def init_app(self, app):
                 project_id=_project_id,
                 transport=transport)
         elif self.exporter.__name__ == 'JaegerExporter':
-            _service_name = self._get_service_name(params)
+            _service_name = params.get(
+                JAEGER_EXPORTER_SERVICE_NAME,
+                self._get_service_name(params))
             _jaeger_host_name = params.get(
-                JAEGER_EXPORTER_HOST_NAME, 'localhost')
+                JAEGER_EXPORTER_HOST_NAME, None)
             _jaeger_port = params.get(
-                JAEGER_EXPORTER_PORT, 14268)
+                JAEGER_EXPORTER_PORT, None)
+            _jaeger_agent_host_name = params.get(
+                JAEGER_EXPORTER_AGENT_HOST_NAME, 'localhost')
+            _jaeger_agent_port = params.get(
+                JAEGER_EXPORTER_AGENT_PORT, 6831)
             self.exporter = self.exporter(
                 service_name=_service_name,
                 host_name=_jaeger_host_name,
                 port=_jaeger_port,
+                agent_host_name=_jaeger_agent_host_name,
+                agent_port=_jaeger_agent_port,
                 transport=transport)
         elif self.exporter.__name__ == 'ZipkinExporter':
             _service_name = self._get_service_name(params)