Enable the configuration of https (#290)

Author: geobeau

README.rst

@@ -285,6 +285,7 @@ setting in ``settings.py``:
         'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
         'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
         'ZIPKIN_EXPORTER_PORT': 9411,
+        'ZIPKIN_EXPORTER_PROTOCOL': 'http',
     }
 
 

docs/trace/usage.rst

@@ -251,6 +251,7 @@ setting in ``settings.py``:
         'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
         'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
         'ZIPKIN_EXPORTER_PORT': 9411,
+        'ZIPKIN_EXPORTER_PROTOCOL': 'http',
     }
 
 

opencensus/trace/exporters/zipkin_exporter.py

@@ -28,6 +28,7 @@
 DEFAULT_ENDPOINT = '/api/v2/spans'
 DEFAULT_HOST_NAME = 'localhost'
 DEFAULT_PORT = 9411
+DEFAULT_PROTOCOL = 'http'
 ZIPKIN_HEADERS = {'Content-Type': 'application/json'}
 
 ISO_DATETIME_REGEX = '%Y-%m-%dT%H:%M:%S.%fZ'
@@ -59,6 +60,9 @@ class ZipkinExporter(base.Exporter):
     :type end_point: str
     :param end_point: (Optional) The path for the span exporting endpoint.
 
+    :type protocol: str
+    :param protocol: (Optional) The protocol used for the request.
+
     :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
                       extend from the base :class:`.Transport` type and
@@ -73,21 +77,24 @@ def __init__(
             host_name=DEFAULT_HOST_NAME,
             port=DEFAULT_PORT,
             endpoint=DEFAULT_ENDPOINT,
+            protocol=DEFAULT_PROTOCOL,
             transport=sync.SyncTransport,
             ipv4=None,
             ipv6=None):
         self.service_name = service_name
         self.host_name = host_name
         self.port = port
         self.endpoint = endpoint
+        self.protocol = protocol
         self.url = self.get_url
         self.transport = transport(self)
         self.ipv4 = ipv4
         self.ipv6 = ipv6
 
     @property
     def get_url(self):
-        return 'http://{}:{}{}'.format(
+        return '{}://{}:{}{}'.format(
+            self.protocol,
             self.host_name,
             self.port,
             self.endpoint)

opencensus/trace/ext/django/config.py

@@ -34,6 +34,7 @@
     'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
     'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
     'ZIPKIN_EXPORTER_PORT': 9411,
+    'ZIPKIN_EXPORTER_PROTOCOL': 'http',
     'TRANSPORT': 'opencensus.trace.exporters.transports.sync.SyncTransport',
 }
 

opencensus/trace/ext/django/middleware.py

@@ -41,6 +41,7 @@
 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'
 
 
 log = logging.getLogger(__name__)
@@ -126,10 +127,13 @@ def __init__(self, get_response=None):
                 ZIPKIN_EXPORTER_HOST_NAME, 'localhost')
             _zipkin_port = settings.params.get(
                 ZIPKIN_EXPORTER_PORT, 9411)
+            _zipkin_protocol = settings.params.get(
+                ZIPKIN_EXPORTER_PROTOCOL, 'http')
             self.exporter = self._exporter(
                 service_name=_zipkin_service_name,
                 host_name=_zipkin_host_name,
                 port=_zipkin_port,
+                protocol=_zipkin_protocol,
                 transport=transport)
         else:
             self.exporter = self._exporter(transport=transport)

opencensus/trace/ext/flask/flask_middleware.py

@@ -42,6 +42,7 @@
 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'
 
 log = logging.getLogger(__name__)
 
@@ -138,10 +139,13 @@ def init_app(self, app):
                 ZIPKIN_EXPORTER_HOST_NAME, 'localhost')
             _zipkin_port = params.get(
                 ZIPKIN_EXPORTER_PORT, 9411)
+            _zipkin_protocol = params.get(
+                ZIPKIN_EXPORTER_PROTOCOL, 'http')
             self.exporter = self.exporter(
                 service_name=_zipkin_service_name,
                 host_name=_zipkin_host_name,
                 port=_zipkin_port,
+                protocol=_zipkin_protocol,
                 transport=transport)
         else:
             self.exporter = self.exporter(transport=transport)

tests/unit/trace/ext/django/test_config.py

@@ -83,6 +83,7 @@ def test__set_default_configs(self):
             'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
             'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
             'ZIPKIN_EXPORTER_PORT': 9411,
+            'ZIPKIN_EXPORTER_PROTOCOL': 'http',
             'TRANSPORT':
                 'opencensus.trace.exporters.transports.sync.SyncTransport',
         }

tests/unit/trace/ext/django/test_middleware.py

@@ -93,10 +93,12 @@ def test_constructor_zipkin(self):
         service_name = 'test_service'
         host_name = 'test_hostname'
         port = 2333
+        protocol = 'http'
         params = {
             'ZIPKIN_EXPORTER_SERVICE_NAME': service_name,
             'ZIPKIN_EXPORTER_HOST_NAME': host_name,
             'ZIPKIN_EXPORTER_PORT': port,
+            'ZIPKIN_EXPORTER_PROTOCOL': protocol,
             'TRANSPORT':
                 'opencensus.trace.exporters.transports.sync.SyncTransport',
         }

tests/unit/trace/ext/flask/test_flask_middleware.py

@@ -117,6 +117,7 @@ def test_init_app_config_stackdriver_exporter(self):
                 'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
                 'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
                 'ZIPKIN_EXPORTER_PORT': 9411,
+                'ZIPKIN_EXPORTER_PROTOCOL': 'http',
             },
         }
 
@@ -145,6 +146,7 @@ def test_init_app_config_zipkin_exporter(self):
                 'ZIPKIN_EXPORTER_SERVICE_NAME': 'my_service',
                 'ZIPKIN_EXPORTER_HOST_NAME': 'localhost',
                 'ZIPKIN_EXPORTER_PORT': 9411,
+                'ZIPKIN_EXPORTER_PROTOCOL': 'http',
             },
         }