Skip to content

Commit eec050b

Browse files
lzchenlzchen
authored
Rename exporter packages from "ext" to "exporter" (#953)
1 parent 35fdac8 commit eec050b

File tree

125 files changed

+221
-384
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+221
-384
lines changed

Diff for: ‎.flake8

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ exclude =
1616
venv*/
1717
target
1818
__pycache__
19-
ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/
20-
ext/opentelemetry-ext-jaeger/build/*
19+
exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
20+
exporter/opentelemetry-exporter-jaeger/build/*
2121
docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
2222
docs/examples/opentelemetry-example-app/build/*
2323
opentelemetry-proto/build/*

Diff for: ‎.github/workflows/docs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- master
77
paths:
88
- 'docs/**'
9+
- 'exporter/**'
910
- 'ext/**'
1011
- 'opentelemetry-python/opentelemetry-api/src/opentelemetry/**'
1112
- 'opentelemetry-python/opentelemetry-sdk/src/opentelemetry/sdk/**'

Diff for: ‎docs/conf.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,20 @@
3030
os.path.abspath("../opentelemetry-instrumentation/src/"),
3131
]
3232

33+
exp = "../exporter"
34+
exp_dirs = [
35+
os.path.abspath("/".join(["../exporter", f, "src"]))
36+
for f in listdir(exp)
37+
if isdir(join(exp, f))
38+
]
39+
3340
ext = "../ext"
3441
ext_dirs = [
3542
os.path.abspath("/".join(["../ext", f, "src"]))
3643
for f in listdir(ext)
3744
if isdir(join(ext, f))
3845
]
39-
sys.path[:0] = source_dirs + ext_dirs
46+
sys.path[:0] = source_dirs + exp_dirs + ext_dirs
4047

4148
# -- Project information -----------------------------------------------------
4249

Diff for: ‎docs/examples/cloud_monitoring/README.rst

-48
This file was deleted.

Diff for: ‎docs/examples/cloud_monitoring/basic_metrics.py

-43
This file was deleted.

Diff for: ‎docs/examples/cloud_trace_exporter/README.rst

-79
This file was deleted.

Diff for: ‎docs/examples/cloud_trace_exporter/basic_trace.py

-14
This file was deleted.

Diff for: ‎docs/examples/datadog_exporter/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Basic Example
1313
1414
pip install opentelemetry-api
1515
pip install opentelemetry-sdk
16-
pip install opentelemetry-ext-datadog
16+
pip install opentelemetry-exporter-datadog
1717
1818
* Start Datadog Agent
1919

@@ -48,7 +48,7 @@ Distributed Example
4848
4949
pip install opentelemetry-api
5050
pip install opentelemetry-sdk
51-
pip install opentelemetry-ext-datadog
51+
pip install opentelemetry-exporter-datadog
5252
pip install opentelemetry-instrumentation
5353
pip install opentelemetry-ext-flask
5454
pip install flask

Diff for: ‎docs/examples/datadog_exporter/basic_example.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
from opentelemetry import trace
18-
from opentelemetry.ext.datadog import (
18+
from opentelemetry.exporter.datadog import (
1919
DatadogExportSpanProcessor,
2020
DatadogSpanExporter,
2121
)

Diff for: ‎docs/examples/datadog_exporter/client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from requests import get
1818

1919
from opentelemetry import propagators, trace
20-
from opentelemetry.ext.datadog import (
20+
from opentelemetry.exporter.datadog import (
2121
DatadogExportSpanProcessor,
2222
DatadogSpanExporter,
2323
)

Diff for: ‎docs/examples/datadog_exporter/server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
from flask import Flask, request
1616

1717
from opentelemetry import propagators, trace
18-
from opentelemetry.ext.datadog import (
18+
from opentelemetry.exporter.datadog import (
1919
DatadogExportSpanProcessor,
2020
DatadogSpanExporter,
2121
)
22-
from opentelemetry.ext.datadog.propagator import DatadogFormat
22+
from opentelemetry.exporter.datadog.propagator import DatadogFormat
2323
from opentelemetry.sdk.trace import TracerProvider
2424

2525
app = Flask(__name__)

Diff for: ‎docs/examples/opencensus-exporter-metrics/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Installation
1313
1414
pip install opentelemetry-api
1515
pip install opentelemetry-sdk
16-
pip install opentelemetry-ext-opencensusexporter
16+
pip install opentelemetry-exporter-opencensus
1717
1818
Run the Example
1919
---------------
@@ -46,7 +46,7 @@ Useful links
4646
- OpenTelemetry_
4747
- `OpenTelemetry Collector`_
4848
- :doc:`../../api/trace`
49-
- :doc:`../../ext/opencensusexporter/opencensusexporter`
49+
- :doc:`../../exporter/opencensus/opencensus`
5050

5151
.. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
5252
.. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector

Diff for: ‎docs/examples/opencensus-exporter-metrics/collector.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"""
1818

1919
from opentelemetry import metrics
20-
from opentelemetry.ext.opencensusexporter.metrics_exporter import (
20+
from opentelemetry.exporter.opencensus.metrics_exporter import (
2121
OpenCensusMetricsExporter,
2222
)
2323
from opentelemetry.sdk.metrics import Counter, MeterProvider

Diff for: ‎docs/examples/opencensus-exporter-tracer/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Installation
1313
1414
pip install opentelemetry-api
1515
pip install opentelemetry-sdk
16-
pip install opentelemetry-ext-opencensusexporter
16+
pip install opentelemetry-exporter-opencensus
1717
1818
Run the Example
1919
---------------
@@ -45,7 +45,7 @@ Useful links
4545
- OpenTelemetry_
4646
- `OpenTelemetry Collector`_
4747
- :doc:`../../api/trace`
48-
- :doc:`../../ext/opencensusexporter/opencensusexporter`
48+
- :doc:`../../exporter/opencensus/opencensus`
4949

5050
.. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/
5151
.. _OpenTelemetry Collector: https://github.com/open-telemetry/opentelemetry-collector

Diff for: ‎docs/examples/opencensus-exporter-tracer/collector.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
from opentelemetry import trace
18-
from opentelemetry.ext.opencensusexporter.trace_exporter import (
18+
from opentelemetry.exporter.opencensus.trace_exporter import (
1919
OpenCensusSpanExporter,
2020
)
2121
from opentelemetry.sdk.trace import TracerProvider

Diff for: ‎docs/examples/opentracing/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env python
22

33
from opentelemetry import trace
4+
from opentelemetry.exporter.jaeger import JaegerSpanExporter
45
from opentelemetry.ext import opentracing_shim
5-
from opentelemetry.ext.jaeger import JaegerSpanExporter
66
from opentelemetry.sdk.trace import TracerProvider
77
from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
88
from rediscache import RedisCache

Diff for: ‎docs/examples/opentracing/requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
opentelemetry-api
22
opentelemetry-sdk
3-
opentelemetry-ext-jaeger
3+
opentelemetry-exporter-jaeger
44
opentelemetry-opentracing-shim
55
redis
66
redis_opentracing

Diff for: ‎docs/ext/datadog/datadog.rst renamed to ‎docs/exporter/datadog/datadog.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenTelemetry Datadog Exporter
22
==============================
33

4-
.. automodule:: opentelemetry.ext.datadog
4+
.. automodule:: opentelemetry.exporter.datadog
55
:members:
66
:undoc-members:
77
:show-inheritance:

Diff for: ‎docs/ext/jaeger/jaeger.rst renamed to ‎docs/exporter/jaeger/jaeger.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Opentelemetry Jaeger Exporter
22
=============================
33

4-
.. automodule:: opentelemetry.ext.jaeger
4+
.. automodule:: opentelemetry.exporter.jaeger
55
:members:
66
:undoc-members:
77
:show-inheritance:
@@ -10,7 +10,7 @@ Opentelemetry Jaeger Exporter
1010
Submodules
1111
----------
1212

13-
.. automodule:: opentelemetry.ext.jaeger.gen.jaeger.ttypes
13+
.. automodule:: opentelemetry.exporter.jaeger.gen.jaeger.ttypes
1414
:members:
1515
:undoc-members:
1616
:show-inheritance:

Diff for: ‎docs/ext/opencensusexporter/opencensusexporter.rst renamed to ‎docs/exporter/opencensus/opencensus.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenCensus Exporter
22
===================
33

4-
.. automodule:: opentelemetry.ext.opencensusexporter
4+
.. automodule:: opentelemetry.exporter.opencensus
55
:members:
66
:undoc-members:
77
:show-inheritance:

Diff for: ‎docs/ext/otlp/otlp.rst renamed to ‎docs/exporter/otlp/otlp.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Opentelemetry OTLP Exporter
22
===========================
33

4-
.. automodule:: opentelemetry.ext.otlp
4+
.. automodule:: opentelemetry.exporter.otlp
55
:members:
66
:undoc-members:
77
:show-inheritance:

0 commit comments

Comments
 (0)