open-telemetry · lzchen · Jul 29, 2020 · Jul 28, 2020 · Jul 28, 2020 · Jul 28, 2020
diff --git a/.flake8 b/.flake8
@@ -16,8 +16,8 @@ exclude =
   venv*/
   target
   __pycache__
-  ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/
-  ext/opentelemetry-ext-jaeger/build/*
+  exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
+  exporter/opentelemetry-ext-jaeger/build/*
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*

diff --git a/docs/conf.py b/docs/conf.py
@@ -30,13 +30,20 @@
     os.path.abspath("../opentelemetry-instrumentation/src/"),
 ]
 
+exp = "../exporter"
+exp_dirs = [
+    os.path.abspath("/".join(["../exporter", f, "src"]))
+    for f in listdir(exp)
+    if isdir(join(exp, f))
+]
+
 ext = "../ext"
 ext_dirs = [
     os.path.abspath("/".join(["../ext", f, "src"]))
     for f in listdir(ext)
     if isdir(join(ext, f))
 ]
-sys.path[:0] = source_dirs + ext_dirs
+sys.path[:0] = source_dirs + exp_dirs + ext_dirs
 
 # -- Project information -----------------------------------------------------
 

diff --git a/docs/examples/cloud_monitoring/README.rst b/docs/examples/cloud_monitoring/README.rst
diff --git a/docs/examples/cloud_monitoring/basic_metrics.py b/docs/examples/cloud_monitoring/basic_metrics.py
diff --git a/docs/examples/cloud_trace_exporter/README.rst b/docs/examples/cloud_trace_exporter/README.rst
diff --git a/docs/examples/cloud_trace_exporter/basic_trace.py b/docs/examples/cloud_trace_exporter/basic_trace.py
diff --git a/docs/examples/datadog_exporter/basic_example.py b/docs/examples/datadog_exporter/basic_example.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from opentelemetry import trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )

diff --git a/docs/examples/datadog_exporter/client.py b/docs/examples/datadog_exporter/client.py
@@ -17,7 +17,7 @@
 from requests import get
 
 from opentelemetry import propagators, trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )

diff --git a/docs/examples/datadog_exporter/server.py b/docs/examples/datadog_exporter/server.py
@@ -15,11 +15,11 @@
 from flask import Flask, request
 
 from opentelemetry import propagators, trace
-from opentelemetry.ext.datadog import (
+from opentelemetry.exporter.datadog import (
     DatadogExportSpanProcessor,
     DatadogSpanExporter,
 )
-from opentelemetry.ext.datadog.propagator import DatadogFormat
+from opentelemetry.exporter.datadog.propagator import DatadogFormat
 from opentelemetry.sdk.trace import TracerProvider
 
 app = Flask(__name__)

diff --git a/docs/examples/opencensus-exporter-metrics/README.rst b/docs/examples/opencensus-exporter-metrics/README.rst
@@ -13,7 +13,7 @@ Installation
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-opencensusexporter
+    pip install opentelemetry-exporter-opencensus
 
 Run the Example
 ---------------
@@ -46,7 +46,7 @@ Useful links
 - OpenTelemetry_
 - `OpenTelemetry Collector`_
 - :doc:`../../api/trace`
-- :doc:`../../ext/opencensusexporter/opencensusexporter`
+- :doc:`../../exporter/opencensus/opencensus`
 
 .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
 .. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector
diff --git a/docs/examples/opencensus-exporter-metrics/collector.py b/docs/examples/opencensus-exporter-metrics/collector.py
@@ -17,7 +17,7 @@
 """
 
 from opentelemetry import metrics
-from opentelemetry.ext.opencensusexporter.metrics_exporter import (
+from opentelemetry.exporter.opencensus.metrics_exporter import (
     OpenCensusMetricsExporter,
 )
 from opentelemetry.sdk.metrics import Counter, MeterProvider

diff --git a/docs/examples/opencensus-exporter-tracer/README.rst b/docs/examples/opencensus-exporter-tracer/README.rst
@@ -13,7 +13,7 @@ Installation
 
     pip install opentelemetry-api
     pip install opentelemetry-sdk
-    pip install opentelemetry-ext-opencensusexporter
+    pip install opentelemetry-exporter-opencensus
 
 Run the Example
 ---------------
@@ -45,7 +45,7 @@ Useful links
 - OpenTelemetry_
 - `OpenTelemetry Collector`_
 - :doc:`../../api/trace`
-- :doc:`../../ext/opencensusexporter/opencensusexporter`
+- :doc:`../../exporter/opencensus/opencensus`
 
 .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
 .. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector
diff --git a/docs/examples/opencensus-exporter-tracer/collector.py b/docs/examples/opencensus-exporter-tracer/collector.py
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 from opentelemetry import trace
-from opentelemetry.ext.opencensusexporter.trace_exporter import (
+from opentelemetry.exporter.opencensus.trace_exporter import (
     OpenCensusSpanExporter,
 )
 from opentelemetry.sdk.trace import TracerProvider

diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 from opentelemetry import trace
+from opentelemetry.exporter.jaeger import JaegerSpanExporter
 from opentelemetry.ext import opentracing_shim
-from opentelemetry.ext.jaeger import JaegerSpanExporter
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
 from rediscache import RedisCache

diff --git a/docs/ext/datadog/datadog.rst → docs/exporter/datadog/datadog.rst b/docs/ext/datadog/datadog.rst → docs/exporter/datadog/datadog.rst
@@ -1,7 +1,7 @@
 OpenTelemetry Datadog Exporter
 ==============================
 
-.. automodule:: opentelemetry.ext.datadog
+.. automodule:: opentelemetry.exporter.datadog
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/ext/jaeger/jaeger.rst → docs/exporter/jaeger/jaeger.rst b/docs/ext/jaeger/jaeger.rst → docs/exporter/jaeger/jaeger.rst
@@ -1,7 +1,7 @@
 Opentelemetry Jaeger Exporter
 =============================
 
-.. automodule:: opentelemetry.ext.jaeger
+.. automodule:: opentelemetry.exporter.jaeger
     :members:
     :undoc-members:
     :show-inheritance:
@@ -10,7 +10,7 @@ Opentelemetry Jaeger Exporter
 Submodules
 ----------
 
-.. automodule:: opentelemetry.ext.jaeger.gen.jaeger.ttypes
+.. automodule:: opentelemetry.exporter.jaeger.gen.jaeger.ttypes
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/...opencensusexporter/opencensusexporter.rst → docs/exporter/opencensus/opencensus.rst b/...opencensusexporter/opencensusexporter.rst → docs/exporter/opencensus/opencensus.rst
@@ -1,7 +1,7 @@
 OpenCensus Exporter
 ===================
 
-.. automodule:: opentelemetry.ext.opencensusexporter
+.. automodule:: opentelemetry.exporter.opencensus
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/ext/otlp/otlp.rst → docs/exporter/otlp/otlp.rst b/docs/ext/otlp/otlp.rst → docs/exporter/otlp/otlp.rst
@@ -1,7 +1,7 @@
 Opentelemetry OTLP Exporter
 ===========================
 
-.. automodule:: opentelemetry.ext.otlp
+.. automodule:: opentelemetry.exporter.otlp
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/ext/prometheus/prometheus.rst → docs/exporter/prometheus/prometheus.rst b/docs/ext/prometheus/prometheus.rst → docs/exporter/prometheus/prometheus.rst
@@ -1,7 +1,7 @@
 OpenTelemetry Prometheus Exporter
 =================================
 
-.. automodule:: opentelemetry.ext.prometheus
+.. automodule:: opentelemetry.exporter.prometheus
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/ext/zipkin/zipkin.rst → docs/exporter/zipkin/zipkin.rst b/docs/ext/zipkin/zipkin.rst → docs/exporter/zipkin/zipkin.rst
@@ -1,7 +1,7 @@
 Opentelemetry Zipkin Exporter
 =============================
 
-.. automodule:: opentelemetry.ext.zipkin
+.. automodule:: opentelemetry.exporter.zipkin
     :members:
     :undoc-members:
     :show-inheritance:
diff --git a/docs/ext/cloud_monitoring/cloud_monitoring.rst b/docs/ext/cloud_monitoring/cloud_monitoring.rst
diff --git a/docs/ext/cloud_trace/cloud_trace.rst b/docs/ext/cloud_trace/cloud_trace.rst