Move built-in exporters to opencensus.trace (#551)

1. Renamed `opencensus.trace.exporters.base` to `opencensus.trace.base_exporter`.
2. Moved `opencensus.trace.exporters.file_exporter` to `opencensus.trace.file_exporter`.
3. Moved `opencensus.trace.exporters.logging_exporter` to `opencensus.trace.logging_exporter`.
4. Removed `opencensus.trace.exporters` namespace.

Author: reyang

README.rst

@@ -132,7 +132,7 @@ file:
 
 .. code:: python
 
-    from opencensus.trace.exporters import file_exporter
+    from opencensus.trace import file_exporter
     from opencensus.trace.tracers import context_tracer
 
     exporter = file_exporter.FileExporter(file_name='traces')

contrib/opencensus-ext-django/README.rst

@@ -37,7 +37,7 @@ You can configure the sampler, exporter, propagator using the ``OPENCENSUS_TRACE
 
     OPENCENSUS_TRACE = {
         'SAMPLER': 'opencensus.trace.samplers.probability.ProbabilitySampler',
-        'REPORTER': 'opencensus.trace.exporters.print_exporter.PrintExporter',
+        'REPORTER': 'opencensus.trace.print_exporter.PrintExporter',
         'PROPAGATOR': 'opencensus.trace.propagation.google_cloud_format.'
                       'GoogleCloudFormatPropagator',
     }

contrib/opencensus-ext-django/opencensus/ext/django/config.py

@@ -20,7 +20,7 @@
 DEFAULT_DJANGO_TRACER_CONFIG = {
     'SAMPLER': 'opencensus.trace.samplers.always_on.AlwaysOnSampler',
     'EXPORTER':
-        'opencensus.trace.exporters.print_exporter.PrintExporter',
+        'opencensus.trace.print_exporter.PrintExporter',
     'PROPAGATOR': 'opencensus.trace.propagation.google_cloud_format.'
                   'GoogleCloudFormatPropagator',
 }

contrib/opencensus-ext-django/tests/test_django_middleware.py

@@ -23,9 +23,9 @@
 from opencensus.ext.ocagent import trace_exporter as ocagent_exporter
 from opencensus.ext.zipkin import trace_exporter as zipkin_exporter
 from opencensus.trace import execution_context
+from opencensus.trace import print_exporter
 from opencensus.trace import span as span_module
 from opencensus.trace import utils
-from opencensus.trace.exporters import print_exporter
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import always_on
 from opencensus.trace.samplers import probability

contrib/opencensus-ext-flask/opencensus/ext/flask/flask_middleware.py

@@ -22,12 +22,12 @@
 from opencensus.common.transports import sync
 from opencensus.trace import attributes_helper
 from opencensus.trace import execution_context
+from opencensus.trace import print_exporter
 from opencensus.trace import span as span_module
 from opencensus.trace import stack_trace
 from opencensus.trace import status
 from opencensus.trace import tracer as tracer_module
 from opencensus.trace import utils
-from opencensus.trace.exporters import print_exporter
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import always_on, probability
 

contrib/opencensus-ext-flask/tests/test_flask_middleware.py

@@ -27,12 +27,12 @@
 from opencensus.ext.stackdriver import trace_exporter as stackdriver_exporter
 from opencensus.ext.zipkin import trace_exporter as zipkin_exporter
 from opencensus.trace import execution_context
+from opencensus.trace import print_exporter
 from opencensus.trace import span as span_module
 from opencensus.trace import span_data
 from opencensus.trace import stack_trace
 from opencensus.trace import status
 from opencensus.trace.blank_span import BlankSpan
-from opencensus.trace.exporters import print_exporter
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import always_off, always_on, ProbabilitySampler
 from opencensus.trace.span_context import SpanContext

contrib/opencensus-ext-jaeger/opencensus/ext/jaeger/trace_exporter/__init__.py

@@ -23,8 +23,8 @@
 from opencensus.common.transports import sync
 from opencensus.common.utils import timestamp_to_microseconds
 from opencensus.ext.jaeger.trace_exporter.gen.jaeger import agent, jaeger
+from opencensus.trace import base_exporter
 from opencensus.trace import link as link_module
-from opencensus.trace.exporters import base
 
 DEFAULT_HOST_NAME = 'localhost'
 DEFAULT_AGENT_PORT = 6831
@@ -35,7 +35,7 @@
 logging = logging.getLogger(__name__)
 
 
-class JaegerExporter(base.Exporter):
+class JaegerExporter(base_exporter.Exporter):
     """Exports the spans to Jaeger.
 
     :type service_name: str
@@ -68,8 +68,8 @@ class JaegerExporter(base.Exporter):
 
     :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
-                      extend from the base :class:`.Transport` type and
-                      implement :meth:`.Transport.export`. Defaults to
+                      extend from the base_exporter :class:`.Transport` type
+                      and implement :meth:`.Transport.export`. Defaults to
                       :class:`.SyncTransport`. The other option is
                       :class:`.AsyncTransport`.
     """
@@ -322,7 +322,7 @@ def _convert_attribute_to_tag(key, attr):
     return None
 
 
-class Collector(base.Exporter):
+class Collector(base_exporter.Exporter):
     """Submits collected spans to Thrift HTTP server.
 
     :type thrift_url: str
@@ -334,8 +334,8 @@ class Collector(base.Exporter):
 
     :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
-                      extend from the base :class:`.Transport` type and
-                      implement :meth:`.Transport.export`. Defaults to
+                      extend from the base_exporter :class:`.Transport` type
+                      and implement :meth:`.Transport.export`. Defaults to
                       :class:`.SyncTransport`. The other option is
                       :class:`.AsyncTransport`.
 
@@ -369,7 +369,8 @@ def __init__(
     def emit(self, batch):
         """Submits batches to Thrift HTTP Server through Binary Protocol.
 
-        :type batch: :class: `~opencensus.trace.exporters.gen.jaeger.Batch`
+        :type batch:
+            :class:`~opencensus.ext.jaeger.trace_exporter.gen.jaeger.Batch`
         :param batch: Object to emit Jaeger spans.
         """
         try:
@@ -390,13 +391,14 @@ def emit(self, batch):
 
     def export(self, batch):
         """
-        :type batch: :class: `~opencensus.trace.exporters.gen.jaeger.Batch`
+        :type batch: :class:
+            `~opencensus.ext.jaeger.trace_exporter.gen.jaeger.Batch`
         :param batch: Object to export Jaeger spans.
         """
         self.transport.export(batch)
 
 
-class AgentClientUDP(base.Exporter):
+class AgentClientUDP(base_exporter.Exporter):
     """Implement a UDP client to agent.
 
     :type host_name: str
@@ -416,8 +418,8 @@ class AgentClientUDP(base.Exporter):
 
     :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
-                      extend from the base :class:`.Transport` type and
-                      implement :meth:`.Transport.export`. Defaults to
+                      extend from the base_exporter :class:`.Transport` type
+                      and implement :meth:`.Transport.export`. Defaults to
                       :class:`.SyncTransport`. The other option is
                       :class:`.AsyncTransport`.
     """
@@ -438,7 +440,8 @@ def __init__(
 
     def emit(self, batch):
         """
-        :type batch: :class: `~opencensus.trace.exporters.gen.jaeger.Batch`
+        :type batch:
+            :class:`~opencensus.ext.jaeger.trace_exporter.gen.jaeger.Batch`
         :param batch: Object to emit Jaeger spans.
         """
         udp_socket = None
@@ -465,7 +468,8 @@ def emit(self, batch):
 
     def export(self, batch):
         """
-        :type batch: :class: `~opencensus.trace.exporters.gen.jaeger.Batch`
+        :type batch:
+            :class:`~opencensus.ext.jaeger.trace_exporter.gen.jaeger.Batch`
         :param batch: Object to export Jaeger spans.
         """
         self.transport.export(batch)

contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/__init__.py

@@ -28,7 +28,7 @@
     import trace_service_pb2
 from opencensus.ext.ocagent.trace_exporter.gen.opencensus.agent.trace.v1 \
     import trace_service_pb2_grpc
-from opencensus.trace.exporters import base
+from opencensus.trace import base_exporter
 
 # Default agent endpoint
 DEFAULT_ENDPOINT = 'localhost:55678'
@@ -37,7 +37,7 @@
 EXPORTER_VERSION = '0.0.1'
 
 
-class TraceExporter(base.Exporter):
+class TraceExporter(base_exporter.Exporter):
     """Export the spans by sending them to opencensus agent.
 
     :type service_name: str
@@ -54,8 +54,8 @@ class TraceExporter(base.Exporter):
 
     :type transport: :class:`type`
     :param transport: Class for creating new transport objects. It should
-                      extend from the base :class:`.Transport` type and
-                      implement :meth:`.Transport.export`. Defaults to
+                      extend from the base_exporter :class:`.Transport` type
+                      and implement :meth:`.Transport.export`. Defaults to
                       :class:`.SyncTransport`. The other option is
                       :class:`.AsyncTransport`.
     """

contrib/opencensus-ext-pyramid/README.rst

@@ -27,7 +27,7 @@ into the pyramid settings
 
 .. code:: python
 
-    from opencensus.trace.exporters import print_exporter
+    from opencensus.trace import print_exporter
     from opencensus.trace.propagation import google_cloud_format
     from opencensus.trace.samplers import probability
 

contrib/opencensus-ext-pyramid/examples/simple.py

@@ -15,7 +15,7 @@
 from wsgiref.simple_server import make_server
 
 from opencensus.trace import config_integration
-from opencensus.trace.exporters import print_exporter
+from opencensus.trace import print_exporter
 from opencensus.trace.samplers import probability
 
 from app import main