From c2c634e347ee9d5b3ba60bad922b2c9c30cb6652 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 12:08:07 -0700 Subject: [PATCH 01/13] exporters --- .../cloud_monitoring/cloud_monitoring.rst | 0 .../cloud_trace/cloud_trace.rst | 0 docs/{ext => exporter}/datadog/datadog.rst | 0 docs/{ext => exporter}/jaeger/jaeger.rst | 0 .../opencensus/opencensus.rst} | 0 docs/{ext => exporter}/otlp/otlp.rst | 0 .../prometheus/prometheus.rst | 0 docs/{ext => exporter}/zipkin/zipkin.rst | 0 .../CHANGELOG.md | 3 ++ .../README.rst | 6 +-- .../opentelemetry-exporter-datadog}/setup.cfg | 4 +- .../opentelemetry-exporter-datadog}/setup.py | 0 .../src/opentelemetry/ext/datadog/__init__.py | 0 .../opentelemetry/ext/datadog/constants.py | 0 .../src/opentelemetry/ext/datadog/exporter.py | 0 .../opentelemetry/ext/datadog/propagator.py | 0 .../ext/datadog/spanprocessor.py | 0 .../src/opentelemetry/ext/datadog/version.py | 0 .../tests/__init__.py | 0 .../tests/test_datadog_exporter.py | 0 .../tests/test_datadog_format.py | 0 .../CHANGELOG.md | 3 ++ .../opentelemetry-exporter-jaeger}/LICENSE | 0 .../MANIFEST.in | 0 .../opentelemetry-exporter-jaeger}/README.rst | 8 ++-- .../examples/jaeger_exporter_example.py | 0 .../opentelemetry-exporter-jaeger}/setup.cfg | 0 .../opentelemetry-exporter-jaeger}/setup.py | 0 .../src/opentelemetry/ext/jaeger/__init__.py | 0 .../opentelemetry/ext/jaeger/gen/__init__.py | 0 .../ext/jaeger/gen/agent/Agent-remote | 0 .../ext/jaeger/gen/agent/Agent.py | 0 .../ext/jaeger/gen/agent/__init__.py | 0 .../ext/jaeger/gen/agent/constants.py | 0 .../ext/jaeger/gen/agent/ttypes.py | 0 .../ext/jaeger/gen/jaeger/Collector-remote | 0 .../ext/jaeger/gen/jaeger/Collector.py | 0 .../ext/jaeger/gen/jaeger/__init__.py | 0 .../ext/jaeger/gen/jaeger/constants.py | 0 .../ext/jaeger/gen/jaeger/ttypes.py | 0 .../gen/zipkincore/ZipkinCollector-remote | 0 .../jaeger/gen/zipkincore/ZipkinCollector.py | 0 .../ext/jaeger/gen/zipkincore/__init__.py | 0 .../ext/jaeger/gen/zipkincore/constants.py | 0 .../ext/jaeger/gen/zipkincore/ttypes.py | 0 .../src/opentelemetry/ext/jaeger/version.py | 0 .../tests/__init__.py | 0 .../tests/test_jaeger_exporter.py | 0 .../thrift/agent.thrift | 0 .../thrift/jaeger.thrift | 0 .../thrift/zipkincore.thrift | 0 .../CHANGELOG.md | 3 ++ .../LICENSE | 0 .../MANIFEST.in | 0 .../README.rst | 8 ++-- .../setup.cfg | 4 +- .../setup.py | 0 .../ext/opencensusexporter/__init__.py | 0 .../metrics_exporter/__init__.py | 0 .../trace_exporter/__init__.py | 0 .../ext/opencensusexporter/util.py | 0 .../ext/opencensusexporter/version.py | 0 .../tests/__init__.py | 0 .../test_otcollector_metrics_exporter.py | 0 .../tests/test_otcollector_trace_exporter.py | 0 .../opentelemetry-exporter-otlp}/CHANGELOG.md | 2 + .../opentelemetry-exporter-otlp}/LICENSE | 0 .../opentelemetry-exporter-otlp}/MANIFEST.in | 0 .../opentelemetry-exporter-otlp}/README.rst | 8 ++-- .../opentelemetry-exporter-otlp}/setup.cfg | 4 +- .../opentelemetry-exporter-otlp}/setup.py | 0 .../src/opentelemetry/ext/otlp/__init__.py | 0 .../ext/otlp/trace_exporter/__init__.py | 0 .../src/opentelemetry/ext/otlp/version.py | 0 .../tests/__init__.py | 0 .../tests/test_otlp_trace_exporter.py | 0 .../CHANGELOG.md | 12 +++++ .../LICENSE | 0 .../MANIFEST.in | 0 .../README.rst | 8 ++-- .../setup.cfg | 4 +- .../setup.py | 0 .../opentelemetry/ext/prometheus/__init__.py | 0 .../opentelemetry/ext/prometheus/version.py | 0 .../tests/__init__.py | 0 .../tests/test_prometheus_exporter.py | 0 .../CHANGELOG.md | 3 ++ .../opentelemetry-exporter-zipkin}/LICENSE | 0 .../MANIFEST.in | 0 .../opentelemetry-exporter-zipkin}/README.rst | 8 ++-- .../opentelemetry-exporter-zipkin}/setup.cfg | 4 +- .../opentelemetry-exporter-zipkin}/setup.py | 0 .../src/opentelemetry/ext/zipkin/__init__.py | 0 .../src/opentelemetry/ext/zipkin/version.py | 0 .../tests/__init__.py | 0 .../tests/test_zipkin_exporter.py | 0 .../setup.cfg | 2 +- ext/opentelemetry-ext-elasticsearch/setup.cfg | 2 +- ext/opentelemetry-ext-jinja2/setup.cfg | 2 +- ext/opentelemetry-ext-mysql/setup.cfg | 2 +- ext/opentelemetry-ext-prometheus/CHANGELOG.md | 9 ---- ext/opentelemetry-ext-psycopg2/setup.cfg | 2 +- ext/opentelemetry-ext-pymemcache/setup.cfg | 2 +- ext/opentelemetry-ext-pymongo/setup.cfg | 2 +- ext/opentelemetry-ext-pymysql/setup.cfg | 2 +- ext/opentelemetry-ext-pyramid/setup.cfg | 2 +- ext/opentelemetry-ext-requests/setup.cfg | 2 +- ext/opentelemetry-ext-sqlite3/setup.cfg | 2 +- scripts/build.sh | 2 +- scripts/coverage.sh | 6 +-- tox.ini | 44 +++++++++---------- 111 files changed, 96 insertions(+), 79 deletions(-) rename docs/{ext => exporter}/cloud_monitoring/cloud_monitoring.rst (100%) rename docs/{ext => exporter}/cloud_trace/cloud_trace.rst (100%) rename docs/{ext => exporter}/datadog/datadog.rst (100%) rename docs/{ext => exporter}/jaeger/jaeger.rst (100%) rename docs/{ext/opencensusexporter/opencensusexporter.rst => exporter/opencensus/opencensus.rst} (100%) rename docs/{ext => exporter}/otlp/otlp.rst (100%) rename docs/{ext => exporter}/prometheus/prometheus.rst (100%) rename docs/{ext => exporter}/zipkin/zipkin.rst (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/CHANGELOG.md (55%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/README.rst (71%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/setup.cfg (91%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/setup.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/__init__.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/constants.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/exporter.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/propagator.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/spanprocessor.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/src/opentelemetry/ext/datadog/version.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/tests/test_datadog_exporter.py (100%) rename {ext/opentelemetry-ext-datadog => exporter/opentelemetry-exporter-datadog}/tests/test_datadog_format.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/CHANGELOG.md (87%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/LICENSE (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/MANIFEST.in (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/README.rst (66%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/examples/jaeger_exporter_example.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/setup.cfg (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/setup.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote (100%) mode change 100755 => 100644 rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/agent/Agent.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/agent/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/agent/constants.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote (100%) mode change 100755 => 100644 rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote (100%) mode change 100755 => 100644 rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/src/opentelemetry/ext/jaeger/version.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/tests/test_jaeger_exporter.py (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/thrift/agent.thrift (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/thrift/jaeger.thrift (100%) rename {ext/opentelemetry-ext-jaeger => exporter/opentelemetry-exporter-jaeger}/thrift/zipkincore.thrift (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/CHANGELOG.md (61%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/LICENSE (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/MANIFEST.in (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/README.rst (57%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/setup.cfg (94%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/setup.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/src/opentelemetry/ext/opencensusexporter/__init__.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/src/opentelemetry/ext/opencensusexporter/util.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/src/opentelemetry/ext/opencensusexporter/version.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/tests/test_otcollector_metrics_exporter.py (100%) rename {ext/opentelemetry-ext-opencensusexporter => exporter/opentelemetry-exporter-opencensus}/tests/test_otcollector_trace_exporter.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/CHANGELOG.md (61%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/LICENSE (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/MANIFEST.in (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/README.rst (70%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/setup.cfg (95%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/setup.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/src/opentelemetry/ext/otlp/__init__.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/src/opentelemetry/ext/otlp/trace_exporter/__init__.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/src/opentelemetry/ext/otlp/version.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-otlp => exporter/opentelemetry-exporter-otlp}/tests/test_otlp_trace_exporter.py (100%) create mode 100644 exporter/opentelemetry-exporter-prometheus/CHANGELOG.md rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/LICENSE (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/MANIFEST.in (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/README.rst (58%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/setup.cfg (94%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/setup.py (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/src/opentelemetry/ext/prometheus/__init__.py (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/src/opentelemetry/ext/prometheus/version.py (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-prometheus => exporter/opentelemetry-exporter-prometheus}/tests/test_prometheus_exporter.py (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/CHANGELOG.md (73%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/LICENSE (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/MANIFEST.in (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/README.rst (59%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/setup.cfg (95%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/setup.py (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/src/opentelemetry/ext/zipkin/__init__.py (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/src/opentelemetry/ext/zipkin/version.py (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/tests/__init__.py (100%) rename {ext/opentelemetry-ext-zipkin => exporter/opentelemetry-exporter-zipkin}/tests/test_zipkin_exporter.py (100%) delete mode 100644 ext/opentelemetry-ext-prometheus/CHANGELOG.md diff --git a/docs/ext/cloud_monitoring/cloud_monitoring.rst b/docs/exporter/cloud_monitoring/cloud_monitoring.rst similarity index 100% rename from docs/ext/cloud_monitoring/cloud_monitoring.rst rename to docs/exporter/cloud_monitoring/cloud_monitoring.rst diff --git a/docs/ext/cloud_trace/cloud_trace.rst b/docs/exporter/cloud_trace/cloud_trace.rst similarity index 100% rename from docs/ext/cloud_trace/cloud_trace.rst rename to docs/exporter/cloud_trace/cloud_trace.rst diff --git a/docs/ext/datadog/datadog.rst b/docs/exporter/datadog/datadog.rst similarity index 100% rename from docs/ext/datadog/datadog.rst rename to docs/exporter/datadog/datadog.rst diff --git a/docs/ext/jaeger/jaeger.rst b/docs/exporter/jaeger/jaeger.rst similarity index 100% rename from docs/ext/jaeger/jaeger.rst rename to docs/exporter/jaeger/jaeger.rst diff --git a/docs/ext/opencensusexporter/opencensusexporter.rst b/docs/exporter/opencensus/opencensus.rst similarity index 100% rename from docs/ext/opencensusexporter/opencensusexporter.rst rename to docs/exporter/opencensus/opencensus.rst diff --git a/docs/ext/otlp/otlp.rst b/docs/exporter/otlp/otlp.rst similarity index 100% rename from docs/ext/otlp/otlp.rst rename to docs/exporter/otlp/otlp.rst diff --git a/docs/ext/prometheus/prometheus.rst b/docs/exporter/prometheus/prometheus.rst similarity index 100% rename from docs/ext/prometheus/prometheus.rst rename to docs/exporter/prometheus/prometheus.rst diff --git a/docs/ext/zipkin/zipkin.rst b/docs/exporter/zipkin/zipkin.rst similarity index 100% rename from docs/ext/zipkin/zipkin.rst rename to docs/exporter/zipkin/zipkin.rst diff --git a/ext/opentelemetry-ext-datadog/CHANGELOG.md b/exporter/opentelemetry-exporter-datadog/CHANGELOG.md similarity index 55% rename from ext/opentelemetry-ext-datadog/CHANGELOG.md rename to exporter/opentelemetry-exporter-datadog/CHANGELOG.md index 15c6ff4b000..68084a7d1a4 100644 --- a/ext/opentelemetry-ext-datadog/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-datadog/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-exporter-datadog + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ## 0.8b0 Released 2020-05-27 diff --git a/ext/opentelemetry-ext-datadog/README.rst b/exporter/opentelemetry-exporter-datadog/README.rst similarity index 71% rename from ext/opentelemetry-ext-datadog/README.rst rename to exporter/opentelemetry-exporter-datadog/README.rst index 9f9a2aeb889..cb97e5997fe 100644 --- a/ext/opentelemetry-ext-datadog/README.rst +++ b/exporter/opentelemetry-exporter-datadog/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Datadog Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-datadog.svg - :target: https://pypi.org/project/opentelemetry-ext-datadog/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-datadog.svg + :target: https://pypi.org/project/opentelemetry-exporter-datadog/ This library allows to export tracing data to `Datadog `_. OpenTelemetry span event and links are not @@ -15,7 +15,7 @@ Installation :: - pip install opentelemetry-ext-datadog + pip install opentelemetry-exporter-datadog .. _Datadog: https://www.datadoghq.com/ diff --git a/ext/opentelemetry-ext-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg similarity index 91% rename from ext/opentelemetry-ext-datadog/setup.cfg rename to exporter/opentelemetry-exporter-datadog/setup.cfg index d97bcdaa69f..e49efbb19ea 100644 --- a/ext/opentelemetry-ext-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-datadog +name = opentelemetry-exporter-datadog description = Datadog Span Exporter for OpenTelemetry long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/ext/opentelemetry-ext-datadog +url = https://github.com/open-telemetry/opentelemetry-python/exporter/opentelemetry-exporter-datadog platforms = any license = Apache-2.0 classifiers = diff --git a/ext/opentelemetry-ext-datadog/setup.py b/exporter/opentelemetry-exporter-datadog/setup.py similarity index 100% rename from ext/opentelemetry-ext-datadog/setup.py rename to exporter/opentelemetry-exporter-datadog/setup.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/__init__.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/__init__.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/__init__.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/__init__.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/constants.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/constants.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/constants.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/constants.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/exporter.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/exporter.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/exporter.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/exporter.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/propagator.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/propagator.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/propagator.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/propagator.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/spanprocessor.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/spanprocessor.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/spanprocessor.py diff --git a/ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/version.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/version.py similarity index 100% rename from ext/opentelemetry-ext-datadog/src/opentelemetry/ext/datadog/version.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/version.py diff --git a/ext/opentelemetry-ext-datadog/tests/__init__.py b/exporter/opentelemetry-exporter-datadog/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-datadog/tests/__init__.py rename to exporter/opentelemetry-exporter-datadog/tests/__init__.py diff --git a/ext/opentelemetry-ext-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py similarity index 100% rename from ext/opentelemetry-ext-datadog/tests/test_datadog_exporter.py rename to exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py diff --git a/ext/opentelemetry-ext-datadog/tests/test_datadog_format.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py similarity index 100% rename from ext/opentelemetry-ext-datadog/tests/test_datadog_format.py rename to exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py diff --git a/ext/opentelemetry-ext-jaeger/CHANGELOG.md b/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md similarity index 87% rename from ext/opentelemetry-ext-jaeger/CHANGELOG.md rename to exporter/opentelemetry-exporter-jaeger/CHANGELOG.md index dada0101e0d..0447864e56a 100644 --- a/ext/opentelemetry-ext-jaeger/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-exporter-jaeger + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ## 0.8b0 Released 2020-05-27 diff --git a/ext/opentelemetry-ext-jaeger/LICENSE b/exporter/opentelemetry-exporter-jaeger/LICENSE similarity index 100% rename from ext/opentelemetry-ext-jaeger/LICENSE rename to exporter/opentelemetry-exporter-jaeger/LICENSE diff --git a/ext/opentelemetry-ext-jaeger/MANIFEST.in b/exporter/opentelemetry-exporter-jaeger/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-jaeger/MANIFEST.in rename to exporter/opentelemetry-exporter-jaeger/MANIFEST.in diff --git a/ext/opentelemetry-ext-jaeger/README.rst b/exporter/opentelemetry-exporter-jaeger/README.rst similarity index 66% rename from ext/opentelemetry-ext-jaeger/README.rst rename to exporter/opentelemetry-exporter-jaeger/README.rst index caa3afa9327..0069d130cdf 100644 --- a/ext/opentelemetry-ext-jaeger/README.rst +++ b/exporter/opentelemetry-exporter-jaeger/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Jaeger Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-jaeger.svg - :target: https://pypi.org/project/opentelemetry-ext-jaeger/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-jaeger.svg + :target: https://pypi.org/project/opentelemetry-exporter-jaeger/ This library allows to export tracing data to `Jaeger `_. @@ -13,7 +13,7 @@ Installation :: - pip install opentelemetry-ext-jaeger + pip install opentelemetry-exporter-jaeger .. _Jaeger: https://www.jaegertracing.io/ @@ -23,6 +23,6 @@ Installation References ---------- -* `OpenTelemetry Jaeger Exporter `_ +* `OpenTelemetry Jaeger Exporter `_ * `Jaeger `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-jaeger/examples/jaeger_exporter_example.py b/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/examples/jaeger_exporter_example.py rename to exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py diff --git a/ext/opentelemetry-ext-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg similarity index 100% rename from ext/opentelemetry-ext-jaeger/setup.cfg rename to exporter/opentelemetry-exporter-jaeger/setup.cfg diff --git a/ext/opentelemetry-ext-jaeger/setup.py b/exporter/opentelemetry-exporter-jaeger/setup.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/setup.py rename to exporter/opentelemetry-exporter-jaeger/setup.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote old mode 100755 new mode 100644 similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote old mode 100755 new mode 100644 similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote old mode 100755 new mode 100644 similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py diff --git a/ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/version.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/version.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/version.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/version.py diff --git a/ext/opentelemetry-ext-jaeger/tests/__init__.py b/exporter/opentelemetry-exporter-jaeger/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/tests/__init__.py rename to exporter/opentelemetry-exporter-jaeger/tests/__init__.py diff --git a/ext/opentelemetry-ext-jaeger/tests/test_jaeger_exporter.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py similarity index 100% rename from ext/opentelemetry-ext-jaeger/tests/test_jaeger_exporter.py rename to exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py diff --git a/ext/opentelemetry-ext-jaeger/thrift/agent.thrift b/exporter/opentelemetry-exporter-jaeger/thrift/agent.thrift similarity index 100% rename from ext/opentelemetry-ext-jaeger/thrift/agent.thrift rename to exporter/opentelemetry-exporter-jaeger/thrift/agent.thrift diff --git a/ext/opentelemetry-ext-jaeger/thrift/jaeger.thrift b/exporter/opentelemetry-exporter-jaeger/thrift/jaeger.thrift similarity index 100% rename from ext/opentelemetry-ext-jaeger/thrift/jaeger.thrift rename to exporter/opentelemetry-exporter-jaeger/thrift/jaeger.thrift diff --git a/ext/opentelemetry-ext-jaeger/thrift/zipkincore.thrift b/exporter/opentelemetry-exporter-jaeger/thrift/zipkincore.thrift similarity index 100% rename from ext/opentelemetry-ext-jaeger/thrift/zipkincore.thrift rename to exporter/opentelemetry-exporter-jaeger/thrift/zipkincore.thrift diff --git a/ext/opentelemetry-ext-opencensusexporter/CHANGELOG.md b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md similarity index 61% rename from ext/opentelemetry-ext-opencensusexporter/CHANGELOG.md rename to exporter/opentelemetry-exporter-opencensus/CHANGELOG.md index 4d1c9a97b82..968e1e72200 100644 --- a/ext/opentelemetry-ext-opencensusexporter/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-exporter-opencensus + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ## 0.8b0 Released 2020-05-27 diff --git a/ext/opentelemetry-ext-opencensusexporter/LICENSE b/exporter/opentelemetry-exporter-opencensus/LICENSE similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/LICENSE rename to exporter/opentelemetry-exporter-opencensus/LICENSE diff --git a/ext/opentelemetry-ext-opencensusexporter/MANIFEST.in b/exporter/opentelemetry-exporter-opencensus/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/MANIFEST.in rename to exporter/opentelemetry-exporter-opencensus/MANIFEST.in diff --git a/ext/opentelemetry-ext-opencensusexporter/README.rst b/exporter/opentelemetry-exporter-opencensus/README.rst similarity index 57% rename from ext/opentelemetry-ext-opencensusexporter/README.rst rename to exporter/opentelemetry-exporter-opencensus/README.rst index 75563053d10..7f282d307e1 100644 --- a/ext/opentelemetry-ext-opencensusexporter/README.rst +++ b/exporter/opentelemetry-exporter-opencensus/README.rst @@ -3,8 +3,8 @@ OpenCensus Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-opencensusexporter.svg - :target: https://pypi.org/project/opentelemetry-ext-opencensusexporter/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-opencensus.svg + :target: https://pypi.org/project/opentelemetry-exporter-opencensus/ This library allows to export traces and metrics using OpenCensus. @@ -13,12 +13,12 @@ Installation :: - pip install opentelemetry-ext-opencensusexporter + pip install opentelemetry-exporter-opencensus References ---------- -* `OpenCensus Exporter `_ +* `OpenCensus Exporter `_ * `OpenTelemetry Collector `_ * `OpenTelemetry `_ diff --git a/ext/opentelemetry-ext-opencensusexporter/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg similarity index 94% rename from ext/opentelemetry-ext-opencensusexporter/setup.cfg rename to exporter/opentelemetry-exporter-opencensus/setup.cfg index ea963dce187..f5df1f46ce1 100644 --- a/ext/opentelemetry-ext-opencensusexporter/setup.cfg +++ b/exporter/opentelemetry-exporter-opencensus/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-opencensusexporter +name = opentelemetry-exporter-opencensus description = OpenCensus Exporter long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-opencensusexporter +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-opencensus platforms = any license = Apache-2.0 classifiers = diff --git a/ext/opentelemetry-ext-opencensusexporter/setup.py b/exporter/opentelemetry-exporter-opencensus/setup.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/setup.py rename to exporter/opentelemetry-exporter-opencensus/setup.py diff --git a/ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/__init__.py diff --git a/ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py diff --git a/ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py diff --git a/ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/util.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/util.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/util.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/util.py diff --git a/ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/version.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/src/opentelemetry/ext/opencensusexporter/version.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/version.py diff --git a/ext/opentelemetry-ext-opencensusexporter/tests/__init__.py b/exporter/opentelemetry-exporter-opencensus/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/tests/__init__.py rename to exporter/opentelemetry-exporter-opencensus/tests/__init__.py diff --git a/ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_metrics_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_metrics_exporter.py rename to exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py diff --git a/ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_trace_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py similarity index 100% rename from ext/opentelemetry-ext-opencensusexporter/tests/test_otcollector_trace_exporter.py rename to exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py diff --git a/ext/opentelemetry-ext-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md similarity index 61% rename from ext/opentelemetry-ext-otlp/CHANGELOG.md rename to exporter/opentelemetry-exporter-otlp/CHANGELOG.md index fbfff4496e0..54c09948828 100644 --- a/ext/opentelemetry-ext-otlp/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased - Update span exporter to use OpenTelemetry Proto v0.4.0 ([#872](https://github.com/open-telemetry/opentelemetry-python/pull/889)) +- Change package name to opentelemetry-exporter-otlp + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) ## 0.9b0 diff --git a/ext/opentelemetry-ext-otlp/LICENSE b/exporter/opentelemetry-exporter-otlp/LICENSE similarity index 100% rename from ext/opentelemetry-ext-otlp/LICENSE rename to exporter/opentelemetry-exporter-otlp/LICENSE diff --git a/ext/opentelemetry-ext-otlp/MANIFEST.in b/exporter/opentelemetry-exporter-otlp/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-otlp/MANIFEST.in rename to exporter/opentelemetry-exporter-otlp/MANIFEST.in diff --git a/ext/opentelemetry-ext-otlp/README.rst b/exporter/opentelemetry-exporter-otlp/README.rst similarity index 70% rename from ext/opentelemetry-ext-otlp/README.rst rename to exporter/opentelemetry-exporter-otlp/README.rst index ab233cbc62b..8adf6571815 100644 --- a/ext/opentelemetry-ext-otlp/README.rst +++ b/exporter/opentelemetry-exporter-otlp/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Collector Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-otlp.svg - :target: https://pypi.org/project/opentelemetry-ext-otlp/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-otlp.svg + :target: https://pypi.org/project/opentelemetry-exporter-otlp/ This library allows to export data to the OpenTelemetry Collector using the OpenTelemetry Protocol. @@ -13,13 +13,13 @@ Installation :: - pip install opentelemetry-ext-otlp + pip install opentelemetry-exporter-otlp References ---------- -* `OpenTelemetry Collector Exporter `_ +* `OpenTelemetry Collector Exporter `_ * `OpenTelemetry Collector `_ * `OpenTelemetry `_ * `OpenTelemetry Protocol Specification `_ diff --git a/ext/opentelemetry-ext-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg similarity index 95% rename from ext/opentelemetry-ext-otlp/setup.cfg rename to exporter/opentelemetry-exporter-otlp/setup.cfg index 65908e0a3c0..f6c4873d5c7 100644 --- a/ext/opentelemetry-ext-otlp/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-otlp +name = opentelemetry-exporter-otlp description = OpenTelemetry Collector Exporter long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-otlp +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-otlp platforms = any license = Apache-2.0 classifiers = diff --git a/ext/opentelemetry-ext-otlp/setup.py b/exporter/opentelemetry-exporter-otlp/setup.py similarity index 100% rename from ext/opentelemetry-ext-otlp/setup.py rename to exporter/opentelemetry-exporter-otlp/setup.py diff --git a/ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/__init__.py similarity index 100% rename from ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/__init__.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/__init__.py diff --git a/ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py similarity index 100% rename from ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py diff --git a/ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/version.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/version.py similarity index 100% rename from ext/opentelemetry-ext-otlp/src/opentelemetry/ext/otlp/version.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/version.py diff --git a/ext/opentelemetry-ext-otlp/tests/__init__.py b/exporter/opentelemetry-exporter-otlp/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-otlp/tests/__init__.py rename to exporter/opentelemetry-exporter-otlp/tests/__init__.py diff --git a/ext/opentelemetry-ext-otlp/tests/test_otlp_trace_exporter.py b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py similarity index 100% rename from ext/opentelemetry-ext-otlp/tests/test_otlp_trace_exporter.py rename to exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py diff --git a/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md b/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md new file mode 100644 index 00000000000..8b6a43594f8 --- /dev/null +++ b/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog + +## Unreleased + +- Change package name to opentelemetry-exporter-prometheus + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + +## 0.4a0 + +Released 2020-02-21 + +- Initial release diff --git a/ext/opentelemetry-ext-prometheus/LICENSE b/exporter/opentelemetry-exporter-prometheus/LICENSE similarity index 100% rename from ext/opentelemetry-ext-prometheus/LICENSE rename to exporter/opentelemetry-exporter-prometheus/LICENSE diff --git a/ext/opentelemetry-ext-prometheus/MANIFEST.in b/exporter/opentelemetry-exporter-prometheus/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-prometheus/MANIFEST.in rename to exporter/opentelemetry-exporter-prometheus/MANIFEST.in diff --git a/ext/opentelemetry-ext-prometheus/README.rst b/exporter/opentelemetry-exporter-prometheus/README.rst similarity index 58% rename from ext/opentelemetry-ext-prometheus/README.rst rename to exporter/opentelemetry-exporter-prometheus/README.rst index 5a85f03582a..a3eb9200005 100644 --- a/ext/opentelemetry-ext-prometheus/README.rst +++ b/exporter/opentelemetry-exporter-prometheus/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Prometheus Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-prometheus.svg - :target: https://pypi.org/project/opentelemetry-ext-prometheus/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-prometheus.svg + :target: https://pypi.org/project/opentelemetry-exporter-prometheus/ This library allows to export metrics data to `Prometheus `_. @@ -13,11 +13,11 @@ Installation :: - pip install opentelemetry-ext-prometheus + pip install opentelemetry-exporter-prometheus References ---------- -* `OpenTelemetry Prometheus Exporter `_ +* `OpenTelemetry Prometheus Exporter `_ * `Prometheus `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-prometheus/setup.cfg b/exporter/opentelemetry-exporter-prometheus/setup.cfg similarity index 94% rename from ext/opentelemetry-ext-prometheus/setup.cfg rename to exporter/opentelemetry-exporter-prometheus/setup.cfg index 5dae17f5cbc..2fcc3caed70 100644 --- a/ext/opentelemetry-ext-prometheus/setup.cfg +++ b/exporter/opentelemetry-exporter-prometheus/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-prometheus +name = opentelemetry-exporter-prometheus description = Prometheus Metric Exporter for OpenTelemetry long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-prometheus +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-prometheus platforms = any license = Apache-2.0 classifiers = diff --git a/ext/opentelemetry-ext-prometheus/setup.py b/exporter/opentelemetry-exporter-prometheus/setup.py similarity index 100% rename from ext/opentelemetry-ext-prometheus/setup.py rename to exporter/opentelemetry-exporter-prometheus/setup.py diff --git a/ext/opentelemetry-ext-prometheus/src/opentelemetry/ext/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/__init__.py similarity index 100% rename from ext/opentelemetry-ext-prometheus/src/opentelemetry/ext/prometheus/__init__.py rename to exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/__init__.py diff --git a/ext/opentelemetry-ext-prometheus/src/opentelemetry/ext/prometheus/version.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/version.py similarity index 100% rename from ext/opentelemetry-ext-prometheus/src/opentelemetry/ext/prometheus/version.py rename to exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/version.py diff --git a/ext/opentelemetry-ext-prometheus/tests/__init__.py b/exporter/opentelemetry-exporter-prometheus/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-prometheus/tests/__init__.py rename to exporter/opentelemetry-exporter-prometheus/tests/__init__.py diff --git a/ext/opentelemetry-ext-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py similarity index 100% rename from ext/opentelemetry-ext-prometheus/tests/test_prometheus_exporter.py rename to exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py diff --git a/ext/opentelemetry-ext-zipkin/CHANGELOG.md b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md similarity index 73% rename from ext/opentelemetry-ext-zipkin/CHANGELOG.md rename to exporter/opentelemetry-exporter-zipkin/CHANGELOG.md index efad477d48a..33408ccbd32 100644 --- a/ext/opentelemetry-ext-zipkin/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-exporter-zipkin + ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ## 0.8b0 Released 2020-05-27 diff --git a/ext/opentelemetry-ext-zipkin/LICENSE b/exporter/opentelemetry-exporter-zipkin/LICENSE similarity index 100% rename from ext/opentelemetry-ext-zipkin/LICENSE rename to exporter/opentelemetry-exporter-zipkin/LICENSE diff --git a/ext/opentelemetry-ext-zipkin/MANIFEST.in b/exporter/opentelemetry-exporter-zipkin/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-zipkin/MANIFEST.in rename to exporter/opentelemetry-exporter-zipkin/MANIFEST.in diff --git a/ext/opentelemetry-ext-zipkin/README.rst b/exporter/opentelemetry-exporter-zipkin/README.rst similarity index 59% rename from ext/opentelemetry-ext-zipkin/README.rst rename to exporter/opentelemetry-exporter-zipkin/README.rst index c746051992e..a23df5eeecc 100644 --- a/ext/opentelemetry-ext-zipkin/README.rst +++ b/exporter/opentelemetry-exporter-zipkin/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Zipkin Exporter |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-zipkin.svg - :target: https://pypi.org/project/opentelemetry-ext-zipkin/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-zipkin.svg + :target: https://pypi.org/project/opentelemetry-exporter-zipkin/ This library allows to export tracing data to `Zipkin `_. @@ -13,12 +13,12 @@ Installation :: - pip install opentelemetry-ext-zipkin + pip install opentelemetry-exporter-zipkin References ---------- -* `OpenTelemetry Zipkin Exporter `_ +* `OpenTelemetry Zipkin Exporter `_ * `Zipkin `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg similarity index 95% rename from ext/opentelemetry-ext-zipkin/setup.cfg rename to exporter/opentelemetry-exporter-zipkin/setup.cfg index 164f0d84c23..8bc6c5aed5f 100644 --- a/ext/opentelemetry-ext-zipkin/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-zipkin +name = opentelemetry-exporter-zipkin description = Zipkin Span Exporter for OpenTelemetry long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-zipkin +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-exporter-zipkin platforms = any license = Apache-2.0 classifiers = diff --git a/ext/opentelemetry-ext-zipkin/setup.py b/exporter/opentelemetry-exporter-zipkin/setup.py similarity index 100% rename from ext/opentelemetry-ext-zipkin/setup.py rename to exporter/opentelemetry-exporter-zipkin/setup.py diff --git a/ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/__init__.py similarity index 100% rename from ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/__init__.py rename to exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/__init__.py diff --git a/ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/version.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/version.py similarity index 100% rename from ext/opentelemetry-ext-zipkin/src/opentelemetry/ext/zipkin/version.py rename to exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/version.py diff --git a/ext/opentelemetry-ext-zipkin/tests/__init__.py b/exporter/opentelemetry-exporter-zipkin/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-zipkin/tests/__init__.py rename to exporter/opentelemetry-exporter-zipkin/tests/__init__.py diff --git a/ext/opentelemetry-ext-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py similarity index 100% rename from ext/opentelemetry-ext-zipkin/tests/test_zipkin_exporter.py rename to exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py diff --git a/ext/opentelemetry-ext-aiohttp-client/setup.cfg b/ext/opentelemetry-ext-aiohttp-client/setup.cfg index 157b6918033..fbdce437aea 100644 --- a/ext/opentelemetry-ext-aiohttp-client/setup.cfg +++ b/ext/opentelemetry-ext-aiohttp-client/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-aiohttp-client -description = OpenTelemetry aiohttp client integration +description = OpenTelemetry aiohttp client instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-elasticsearch/setup.cfg b/ext/opentelemetry-ext-elasticsearch/setup.cfg index 40f3b392b4d..42c80e299b9 100644 --- a/ext/opentelemetry-ext-elasticsearch/setup.cfg +++ b/ext/opentelemetry-ext-elasticsearch/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-elasticsearch -description = OpenTelemetry elasticsearch integration +description = OpenTelemetry elasticsearch instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-jinja2/setup.cfg b/ext/opentelemetry-ext-jinja2/setup.cfg index 54a7515150f..10541241ebf 100644 --- a/ext/opentelemetry-ext-jinja2/setup.cfg +++ b/ext/opentelemetry-ext-jinja2/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-jinja2 -description = OpenTelemetry jinja2 integration +description = OpenTelemetry jinja2 instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-mysql/setup.cfg b/ext/opentelemetry-ext-mysql/setup.cfg index ceb985e8b41..99a8374e75d 100644 --- a/ext/opentelemetry-ext-mysql/setup.cfg +++ b/ext/opentelemetry-ext-mysql/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-mysql -description = OpenTelemetry MySQL integration +description = OpenTelemetry MySQL instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-prometheus/CHANGELOG.md b/ext/opentelemetry-ext-prometheus/CHANGELOG.md deleted file mode 100644 index d5a548aa13d..00000000000 --- a/ext/opentelemetry-ext-prometheus/CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -# Changelog - -## Unreleased - -## 0.4a0 - -Released 2020-02-21 - -- Initial release diff --git a/ext/opentelemetry-ext-psycopg2/setup.cfg b/ext/opentelemetry-ext-psycopg2/setup.cfg index bb0fd9a57c4..78ee1b147a5 100644 --- a/ext/opentelemetry-ext-psycopg2/setup.cfg +++ b/ext/opentelemetry-ext-psycopg2/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-psycopg2 -description = OpenTelemetry psycopg2 integration +description = OpenTelemetry psycopg2 instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymemcache/setup.cfg b/ext/opentelemetry-ext-pymemcache/setup.cfg index c2252274b1f..f6fcc0f70f9 100644 --- a/ext/opentelemetry-ext-pymemcache/setup.cfg +++ b/ext/opentelemetry-ext-pymemcache/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymemcache -description = OpenTelemetry pymemcache integration +description = OpenTelemetry pymemcache instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymongo/setup.cfg b/ext/opentelemetry-ext-pymongo/setup.cfg index 5e08d987763..c2055f65ced 100644 --- a/ext/opentelemetry-ext-pymongo/setup.cfg +++ b/ext/opentelemetry-ext-pymongo/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymongo -description = OpenTelemetry pymongo integration +description = OpenTelemetry pymongo instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymysql/setup.cfg b/ext/opentelemetry-ext-pymysql/setup.cfg index db28ef9581e..dedebed1ede 100644 --- a/ext/opentelemetry-ext-pymysql/setup.cfg +++ b/ext/opentelemetry-ext-pymysql/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymysql -description = OpenTelemetry PyMySQL integration +description = OpenTelemetry PyMySQL instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pyramid/setup.cfg b/ext/opentelemetry-ext-pyramid/setup.cfg index bcdf850e87c..3350a0c6c9d 100644 --- a/ext/opentelemetry-ext-pyramid/setup.cfg +++ b/ext/opentelemetry-ext-pyramid/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pyramid -description = OpenTelemetry Pyramid integration +description = OpenTelemetry Pyramid instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-requests/setup.cfg b/ext/opentelemetry-ext-requests/setup.cfg index 714a1b3231a..3d3f9f19189 100644 --- a/ext/opentelemetry-ext-requests/setup.cfg +++ b/ext/opentelemetry-ext-requests/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-requests -description = OpenTelemetry requests integration +description = OpenTelemetry requests instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-sqlite3/setup.cfg b/ext/opentelemetry-ext-sqlite3/setup.cfg index 95f60988eab..6eff4b1e688 100644 --- a/ext/opentelemetry-ext-sqlite3/setup.cfg +++ b/ext/opentelemetry-ext-sqlite3/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-sqlite3 -description = OpenTelemetry SQLite3 integration +description = OpenTelemetry SQLite3 instrumentation long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/scripts/build.sh b/scripts/build.sh index 7a27105d76e..0d481b8165d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -16,7 +16,7 @@ DISTDIR=dist mkdir -p $DISTDIR rm -rf $DISTDIR/* - for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-instrumentation/ opentelemetry-proto/ ext/*/ ; do + for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-instrumentation/ opentelemetry-proto/ exporter/*/ ext/*/ ; do ( echo "building $d" cd "$d" diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 0b45fbf643b..5cf393e7e66 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -31,13 +31,13 @@ coverage erase cov opentelemetry-api cov opentelemetry-sdk -cov ext/opentelemetry-ext-datadog +cov exporter/opentelemetry-exporter-datadog cov ext/opentelemetry-ext-flask cov ext/opentelemetry-ext-requests -cov ext/opentelemetry-ext-jaeger +cov exporter/opentelemetry-exporter-jaeger cov ext/opentelemetry-ext-opentracing-shim cov ext/opentelemetry-ext-wsgi -cov ext/opentelemetry-ext-zipkin +cov exporter/opentelemetry-exporter-zipkin cov docs/examples/opentelemetry-example-app # aiohttp is only supported on Python 3.5+. diff --git a/tox.ini b/tox.ini index f956733d566..94895aa3bc9 100644 --- a/tox.ini +++ b/tox.ini @@ -78,26 +78,26 @@ envlist = py3{4,5,6,7,8}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 - ; opentelemetry-ext-jaeger + ; opentelemetry-exporter-jaeger py3{4,5,6,7,8}-test-exporter-jaeger pypy3-test-exporter-jaeger - ; opentelemetry-ext-datadog + ; opentelemetry-exporter-datadog py3{5,6,7,8}-test-exporter-datadog ; opentelemetry-ext-mysql py3{4,5,6,7,8}-test-instrumentation-mysql pypy3-test-instrumentation-mysql - ; opentelemetry-ext-opencensusexporter - py3{4,5,6,7,8}-test-exporter-opencensusexporter - ; ext-opencensusexporter intentionally excluded from pypy3 + ; opentelemetry-exporter-opencensus + py3{4,5,6,7,8}-test-exporter-opencensus + ; exporter-opencensus intentionally excluded from pypy3 - ; opentelemetry-ext-otlp + ; opentelemetry-exporter-otlp py3{5,6,7,8}-test-exporter-otlp - ; ext-otlp intentionally excluded from pypy3 + ; exporter-otlp intentionally excluded from pypy3 - ; opentelemetry-ext-prometheus + ; opentelemetry-exporter-prometheus py3{4,5,6,7,8}-test-exporter-prometheus pypy3-test-exporter-prometheus @@ -137,7 +137,7 @@ envlist = py3{4,5,6,7,8}-test-instrumentation-wsgi pypy3-test-instrumentation-wsgi - ; opentelemetry-ext-zipkin + ; opentelemetry-exporter-zipkin py3{4,5,6,7,8}-test-exporter-zipkin pypy3-test-exporter-zipkin @@ -226,12 +226,12 @@ changedir = test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests test-instrumentation-wsgi: ext/opentelemetry-ext-wsgi/tests - test-exporter-jaeger: ext/opentelemetry-ext-jaeger/tests - test-exporter-datadog: ext/opentelemetry-ext-datadog/tests - test-exporter-opencensusexporter: ext/opentelemetry-ext-opencensusexporter/tests - test-exporter-otlp: ext/opentelemetry-ext-otlp/tests - test-exporter-prometheus: ext/opentelemetry-ext-prometheus/tests - test-exporter-zipkin: ext/opentelemetry-ext-zipkin/tests + test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests + test-exporter-datadog: exporter/opentelemetry-exporter-datadog/tests + test-exporter-opencensus: exporter/opentelemetry-exporter-opencensus/tests + test-exporter-otlp: exporter/opentelemetry-exporter-otlp/tests + test-exporter-prometheus: exporter/opentelemetry-exporter-prometheus/tests + test-exporter-zipkin: exporter/opentelemetry-exporter-zipkin/tests commands_pre = ; Install without -e to test the actual installation @@ -271,12 +271,12 @@ commands_pre = mysql: pip install {toxinidir}/ext/opentelemetry-ext-dbapi {toxinidir}/ext/opentelemetry-ext-mysql[test] - opencensusexporter: pip install {toxinidir}/ext/opentelemetry-ext-opencensusexporter + opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus otlp: pip install {toxinidir}/opentelemetry-proto - otlp: pip install {toxinidir}/ext/opentelemetry-ext-otlp + otlp: pip install {toxinidir}/exporter/opentelemetry-exporter-otlp - prometheus: pip install {toxinidir}/ext/opentelemetry-ext-prometheus + prometheus: pip install {toxinidir}/exporter/opentelemetry-exporter-prometheus pymemcache: pip install {toxinidir}/ext/opentelemetry-ext-pymemcache[test] @@ -302,14 +302,14 @@ commands_pre = aiopg: pip install {toxinidir}/ext/opentelemetry-ext-dbapi pip install {toxinidir}/ext/opentelemetry-instrumentation-aiopg[test] - jaeger: pip install {toxinidir}/ext/opentelemetry-ext-jaeger + jaeger: pip install {toxinidir}/exporter/opentelemetry-exporter-jaeger opentracing-shim: pip install {toxinidir}/opentelemetry-sdk opentracing-shim: pip install {toxinidir}/ext/opentelemetry-ext-opentracing-shim - datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/ext/opentelemetry-ext-datadog + datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/exporter/opentelemetry-exporter-datadog - zipkin: pip install {toxinidir}/ext/opentelemetry-ext-zipkin + zipkin: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin sqlalchemy: pip install {toxinidir}/ext/opentelemetry-ext-sqlalchemy @@ -423,7 +423,7 @@ commands_pre = -e {toxinidir}/ext/opentelemetry-instrumentation-aiopg \ -e {toxinidir}/ext/opentelemetry-ext-redis \ -e {toxinidir}/ext/opentelemetry-ext-system-metrics \ - -e {toxinidir}/ext/opentelemetry-ext-opencensusexporter + -e {toxinidir}/ext/opentelemetry-exporter-opencensus docker-compose up -d python check_availability.py commands = From 97a85bf9f45cf97198d6df1a4318afc0267e6847 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 12:35:23 -0700 Subject: [PATCH 02/13] errors --- docs/exporter/datadog/datadog.rst | 2 +- docs/exporter/jaeger/jaeger.rst | 4 ++-- docs/exporter/opencensus/opencensus.rst | 2 +- docs/exporter/otlp/otlp.rst | 2 +- docs/exporter/prometheus/prometheus.rst | 2 +- docs/exporter/zipkin/zipkin.rst | 2 +- eachdist.ini | 1 + tox.ini | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/docs/exporter/datadog/datadog.rst b/docs/exporter/datadog/datadog.rst index 5ae7e042890..3b43c2bdf72 100644 --- a/docs/exporter/datadog/datadog.rst +++ b/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/exporter/jaeger/jaeger.rst b/docs/exporter/jaeger/jaeger.rst index d7b93a6f10f..6988d8cea9c 100644 --- a/docs/exporter/jaeger/jaeger.rst +++ b/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/docs/exporter/opencensus/opencensus.rst b/docs/exporter/opencensus/opencensus.rst index 07b9a855582..6bdcd6a873c 100644 --- a/docs/exporter/opencensus/opencensus.rst +++ b/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/exporter/otlp/otlp.rst b/docs/exporter/otlp/otlp.rst index 4739d21a581..7663ec9489c 100644 --- a/docs/exporter/otlp/otlp.rst +++ b/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/exporter/prometheus/prometheus.rst b/docs/exporter/prometheus/prometheus.rst index 9ca7754af95..f4ad1a8245b 100644 --- a/docs/exporter/prometheus/prometheus.rst +++ b/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/exporter/zipkin/zipkin.rst b/docs/exporter/zipkin/zipkin.rst index 8a5191a86d1..18042022a45 100644 --- a/docs/exporter/zipkin/zipkin.rst +++ b/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/eachdist.ini b/eachdist.ini index c77d82f345f..defc3e0c9dd 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -10,6 +10,7 @@ sortfirst= ext/opentelemetry-ext-wsgi ext/opentelemetry-ext-dbapi ext/opentelemetry-ext-asgi + exporter/* ext/* [lintroots] diff --git a/tox.ini b/tox.ini index 94895aa3bc9..9c38d26a337 100644 --- a/tox.ini +++ b/tox.ini @@ -423,7 +423,7 @@ commands_pre = -e {toxinidir}/ext/opentelemetry-instrumentation-aiopg \ -e {toxinidir}/ext/opentelemetry-ext-redis \ -e {toxinidir}/ext/opentelemetry-ext-system-metrics \ - -e {toxinidir}/ext/opentelemetry-exporter-opencensus + -e {toxinidir}/exporter/opentelemetry-exporter-opencensus docker-compose up -d python check_availability.py commands = From 5caffecdbe0f5d9ff072f44a7bbae327654cc185 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 12:36:19 -0700 Subject: [PATCH 03/13] changelog --- exporter/opentelemetry-exporter-datadog/CHANGELOG.md | 2 +- exporter/opentelemetry-exporter-jaeger/CHANGELOG.md | 2 +- exporter/opentelemetry-exporter-opencensus/CHANGELOG.md | 2 +- exporter/opentelemetry-exporter-zipkin/CHANGELOG.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exporter/opentelemetry-exporter-datadog/CHANGELOG.md b/exporter/opentelemetry-exporter-datadog/CHANGELOG.md index 68084a7d1a4..d15d5a4b5d1 100644 --- a/exporter/opentelemetry-exporter-datadog/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-datadog/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-exporter-datadog - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.8b0 diff --git a/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md b/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md index 0447864e56a..7b9a03d3122 100644 --- a/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-jaeger/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-exporter-jaeger - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.8b0 diff --git a/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md index 968e1e72200..c7f0cf69b5c 100644 --- a/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-exporter-opencensus - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.8b0 diff --git a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md index 33408ccbd32..2218d44c20b 100644 --- a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-exporter-zipkin - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.8b0 From e95d42ad2be2c7026cc43a3fae61c4724f3479a7 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 12:57:33 -0700 Subject: [PATCH 04/13] rename --- .../src/opentelemetry/{ext => exporter}/datadog/__init__.py | 0 .../src/opentelemetry/{ext => exporter}/datadog/constants.py | 0 .../src/opentelemetry/{ext => exporter}/datadog/exporter.py | 0 .../src/opentelemetry/{ext => exporter}/datadog/propagator.py | 0 .../opentelemetry/{ext => exporter}/datadog/spanprocessor.py | 0 .../src/opentelemetry/{ext => exporter}/datadog/version.py | 0 .../src/opentelemetry/{ext => exporter}/jaeger/__init__.py | 0 .../src/opentelemetry/{ext => exporter}/jaeger/gen/__init__.py | 0 .../{ext => exporter}/jaeger/gen/agent/Agent-remote | 0 .../opentelemetry/{ext => exporter}/jaeger/gen/agent/Agent.py | 0 .../{ext => exporter}/jaeger/gen/agent/__init__.py | 0 .../{ext => exporter}/jaeger/gen/agent/constants.py | 0 .../opentelemetry/{ext => exporter}/jaeger/gen/agent/ttypes.py | 0 .../{ext => exporter}/jaeger/gen/jaeger/Collector-remote | 0 .../{ext => exporter}/jaeger/gen/jaeger/Collector.py | 0 .../{ext => exporter}/jaeger/gen/jaeger/__init__.py | 0 .../{ext => exporter}/jaeger/gen/jaeger/constants.py | 0 .../opentelemetry/{ext => exporter}/jaeger/gen/jaeger/ttypes.py | 0 .../jaeger/gen/zipkincore/ZipkinCollector-remote | 0 .../{ext => exporter}/jaeger/gen/zipkincore/ZipkinCollector.py | 0 .../{ext => exporter}/jaeger/gen/zipkincore/__init__.py | 0 .../{ext => exporter}/jaeger/gen/zipkincore/constants.py | 0 .../{ext => exporter}/jaeger/gen/zipkincore/ttypes.py | 0 .../src/opentelemetry/{ext => exporter}/jaeger/version.py | 0 .../{ext => exporter}/opencensusexporter/__init__.py | 0 .../opencensusexporter/metrics_exporter/__init__.py | 0 .../opencensusexporter/trace_exporter/__init__.py | 0 .../opentelemetry/{ext => exporter}/opencensusexporter/util.py | 0 .../{ext => exporter}/opencensusexporter/version.py | 0 exporter/opentelemetry-exporter-otlp/CHANGELOG.md | 2 +- .../src/opentelemetry/{ext => exporter}/otlp/__init__.py | 0 .../{ext => exporter}/otlp/trace_exporter/__init__.py | 0 .../src/opentelemetry/{ext => exporter}/otlp/version.py | 0 exporter/opentelemetry-exporter-prometheus/CHANGELOG.md | 2 +- .../src/opentelemetry/{ext => exporter}/prometheus/__init__.py | 0 .../src/opentelemetry/{ext => exporter}/prometheus/version.py | 0 .../src/opentelemetry/{ext => exporter}/zipkin/__init__.py | 0 .../src/opentelemetry/{ext => exporter}/zipkin/version.py | 0 38 files changed, 2 insertions(+), 2 deletions(-) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/__init__.py (100%) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/constants.py (100%) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/exporter.py (100%) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/propagator.py (100%) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/spanprocessor.py (100%) rename exporter/opentelemetry-exporter-datadog/src/opentelemetry/{ext => exporter}/datadog/version.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/__init__.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/__init__.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/agent/Agent-remote (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/agent/Agent.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/agent/__init__.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/agent/constants.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/agent/ttypes.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/jaeger/Collector-remote (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/jaeger/Collector.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/jaeger/__init__.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/jaeger/constants.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/jaeger/ttypes.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/zipkincore/ZipkinCollector-remote (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/zipkincore/ZipkinCollector.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/zipkincore/__init__.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/zipkincore/constants.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/gen/zipkincore/ttypes.py (100%) rename exporter/opentelemetry-exporter-jaeger/src/opentelemetry/{ext => exporter}/jaeger/version.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/{ext => exporter}/opencensusexporter/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/{ext => exporter}/opencensusexporter/metrics_exporter/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/{ext => exporter}/opencensusexporter/trace_exporter/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/{ext => exporter}/opencensusexporter/util.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/{ext => exporter}/opencensusexporter/version.py (100%) rename exporter/opentelemetry-exporter-otlp/src/opentelemetry/{ext => exporter}/otlp/__init__.py (100%) rename exporter/opentelemetry-exporter-otlp/src/opentelemetry/{ext => exporter}/otlp/trace_exporter/__init__.py (100%) rename exporter/opentelemetry-exporter-otlp/src/opentelemetry/{ext => exporter}/otlp/version.py (100%) rename exporter/opentelemetry-exporter-prometheus/src/opentelemetry/{ext => exporter}/prometheus/__init__.py (100%) rename exporter/opentelemetry-exporter-prometheus/src/opentelemetry/{ext => exporter}/prometheus/version.py (100%) rename exporter/opentelemetry-exporter-zipkin/src/opentelemetry/{ext => exporter}/zipkin/__init__.py (100%) rename exporter/opentelemetry-exporter-zipkin/src/opentelemetry/{ext => exporter}/zipkin/version.py (100%) diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/__init__.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/__init__.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/constants.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/constants.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/exporter.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/exporter.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/propagator.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/propagator.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/propagator.py diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/spanprocessor.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/spanprocessor.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/spanprocessor.py diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/version.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py similarity index 100% rename from exporter/opentelemetry-exporter-datadog/src/opentelemetry/ext/datadog/version.py rename to exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/__init__.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/Agent-remote similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/Agent-remote diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/Agent.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/Agent.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/Agent.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/__init__.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/constants.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/constants.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/ttypes.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/agent/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/agent/ttypes.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/Collector-remote similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/Collector-remote diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/Collector.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/Collector.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/Collector.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/__init__.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/constants.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/constants.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/ttypes.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/jaeger/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/jaeger/ttypes.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ZipkinCollector-remote similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector-remote rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ZipkinCollector-remote diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ZipkinCollector.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ZipkinCollector.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ZipkinCollector.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/__init__.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/__init__.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/constants.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/constants.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/constants.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ttypes.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/gen/zipkincore/ttypes.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/zipkincore/ttypes.py diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/version.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py similarity index 100% rename from exporter/opentelemetry-exporter-jaeger/src/opentelemetry/ext/jaeger/version.py rename to exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/metrics_exporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/metrics_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/metrics_exporter/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/trace_exporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/trace_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/trace_exporter/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/util.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/util.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/util.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/util.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/version.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/ext/opencensusexporter/version.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/version.py diff --git a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md index 54c09948828..12c79e064e7 100644 --- a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md @@ -4,7 +4,7 @@ - Update span exporter to use OpenTelemetry Proto v0.4.0 ([#872](https://github.com/open-telemetry/opentelemetry-python/pull/889)) - Change package name to opentelemetry-exporter-otlp - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.9b0 diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/__init__.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/trace_exporter/__init__.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/trace_exporter/__init__.py diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/version.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py similarity index 100% rename from exporter/opentelemetry-exporter-otlp/src/opentelemetry/ext/otlp/version.py rename to exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py diff --git a/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md b/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md index 8b6a43594f8..5c978d394d4 100644 --- a/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-prometheus/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-exporter-prometheus - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.4a0 diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/__init__.py rename to exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/version.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py similarity index 100% rename from exporter/opentelemetry-exporter-prometheus/src/opentelemetry/ext/prometheus/version.py rename to exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/__init__.py rename to exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/version.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py similarity index 100% rename from exporter/opentelemetry-exporter-zipkin/src/opentelemetry/ext/zipkin/version.py rename to exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py From 084ea18e209280ee2dd6d41fffe013e275c3410f Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 13:00:12 -0700 Subject: [PATCH 05/13] black --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5911dc4e9f5..db4df73b69e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ exclude = ''' ( /( # generated files docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen| - ext/opentelemetry-ext-jaeger/src/opentelemetry/ext/jaeger/gen| + exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen| opentelemetry-proto/src/opentelemetry/proto/collector| opentelemetry-proto/src/opentelemetry/proto/common| opentelemetry-proto/src/opentelemetry/proto/metrics| From 5154b72eb3d0266135efbaad2af73e7ed322290b Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 13:43:45 -0700 Subject: [PATCH 06/13] fix --- docs/exporter/cloud_monitoring/cloud_monitoring.rst | 7 ------- docs/exporter/cloud_trace/cloud_trace.rst | 7 ------- exporter/opentelemetry-exporter-datadog/setup.py | 2 +- exporter/opentelemetry-exporter-jaeger/setup.py | 2 +- exporter/opentelemetry-exporter-opencensus/setup.py | 2 +- .../{opencensusexporter => opencensus}/__init__.py | 0 .../metrics_exporter/__init__.py | 0 .../trace_exporter/__init__.py | 0 .../exporter/{opencensusexporter => opencensus}/util.py | 0 .../exporter/{opencensusexporter => opencensus}/version.py | 0 exporter/opentelemetry-exporter-otlp/setup.py | 2 +- exporter/opentelemetry-exporter-prometheus/setup.py | 2 +- exporter/opentelemetry-exporter-zipkin/setup.py | 2 +- ext/opentelemetry-ext-aiohttp-client/setup.cfg | 2 +- ext/opentelemetry-ext-elasticsearch/setup.cfg | 2 +- ext/opentelemetry-ext-jinja2/setup.cfg | 2 +- ext/opentelemetry-ext-mysql/setup.cfg | 2 +- ext/opentelemetry-ext-psycopg2/setup.cfg | 2 +- ext/opentelemetry-ext-pymemcache/setup.cfg | 2 +- ext/opentelemetry-ext-pymongo/setup.cfg | 2 +- ext/opentelemetry-ext-pymysql/setup.cfg | 2 +- ext/opentelemetry-ext-pyramid/setup.cfg | 2 +- ext/opentelemetry-ext-requests/setup.cfg | 2 +- ext/opentelemetry-ext-sqlite3/setup.cfg | 2 +- 24 files changed, 17 insertions(+), 31 deletions(-) delete mode 100644 docs/exporter/cloud_monitoring/cloud_monitoring.rst delete mode 100644 docs/exporter/cloud_trace/cloud_trace.rst rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/{opencensusexporter => opencensus}/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/{opencensusexporter => opencensus}/metrics_exporter/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/{opencensusexporter => opencensus}/trace_exporter/__init__.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/{opencensusexporter => opencensus}/util.py (100%) rename exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/{opencensusexporter => opencensus}/version.py (100%) diff --git a/docs/exporter/cloud_monitoring/cloud_monitoring.rst b/docs/exporter/cloud_monitoring/cloud_monitoring.rst deleted file mode 100644 index a3a4f5660ad..00000000000 --- a/docs/exporter/cloud_monitoring/cloud_monitoring.rst +++ /dev/null @@ -1,7 +0,0 @@ -OpenTelemetry Cloud Monitoring Exporter -======================================= - -.. automodule:: opentelemetry.exporter.cloud_monitoring - :members: - :undoc-members: - :show-inheritance: \ No newline at end of file diff --git a/docs/exporter/cloud_trace/cloud_trace.rst b/docs/exporter/cloud_trace/cloud_trace.rst deleted file mode 100644 index 5914b00d1a4..00000000000 --- a/docs/exporter/cloud_trace/cloud_trace.rst +++ /dev/null @@ -1,7 +0,0 @@ -OpenTelemetry Cloud Trace Exporter -================================== - -.. automodule:: opentelemetry.exporter.cloud_trace - :members: - :undoc-members: - :show-inheritance: diff --git a/exporter/opentelemetry-exporter-datadog/setup.py b/exporter/opentelemetry-exporter-datadog/setup.py index f6573911046..0c3bdf453fd 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.py +++ b/exporter/opentelemetry-exporter-datadog/setup.py @@ -18,7 +18,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "datadog", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "datadog", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/exporter/opentelemetry-exporter-jaeger/setup.py b/exporter/opentelemetry-exporter-jaeger/setup.py index 842a6f6416b..1bd39703297 100644 --- a/exporter/opentelemetry-exporter-jaeger/setup.py +++ b/exporter/opentelemetry-exporter-jaeger/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "jaeger", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "jaeger", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/exporter/opentelemetry-exporter-opencensus/setup.py b/exporter/opentelemetry-exporter-opencensus/setup.py index dfb8fd82bff..65c91aba9ff 100644 --- a/exporter/opentelemetry-exporter-opencensus/setup.py +++ b/exporter/opentelemetry-exporter-opencensus/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "opencensusexporter", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "opencensus", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/metrics_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/metrics_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/trace_exporter/__init__.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/util.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/util.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py similarity index 100% rename from exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensusexporter/version.py rename to exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py diff --git a/exporter/opentelemetry-exporter-otlp/setup.py b/exporter/opentelemetry-exporter-otlp/setup.py index 64c30afbaba..c04c30fca48 100644 --- a/exporter/opentelemetry-exporter-otlp/setup.py +++ b/exporter/opentelemetry-exporter-otlp/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "otlp", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "otlp", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/exporter/opentelemetry-exporter-prometheus/setup.py b/exporter/opentelemetry-exporter-prometheus/setup.py index 0276cd66554..86067a2bd56 100644 --- a/exporter/opentelemetry-exporter-prometheus/setup.py +++ b/exporter/opentelemetry-exporter-prometheus/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "prometheus", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "prometheus", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/exporter/opentelemetry-exporter-zipkin/setup.py b/exporter/opentelemetry-exporter-zipkin/setup.py index a01df70c9d0..9822805d9dc 100644 --- a/exporter/opentelemetry-exporter-zipkin/setup.py +++ b/exporter/opentelemetry-exporter-zipkin/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "zipkin", "version.py" + BASE_DIR, "src", "opentelemetry", "exporter", "zipkin", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-aiohttp-client/setup.cfg b/ext/opentelemetry-ext-aiohttp-client/setup.cfg index fbdce437aea..157b6918033 100644 --- a/ext/opentelemetry-ext-aiohttp-client/setup.cfg +++ b/ext/opentelemetry-ext-aiohttp-client/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-aiohttp-client -description = OpenTelemetry aiohttp client instrumentation +description = OpenTelemetry aiohttp client integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-elasticsearch/setup.cfg b/ext/opentelemetry-ext-elasticsearch/setup.cfg index 42c80e299b9..40f3b392b4d 100644 --- a/ext/opentelemetry-ext-elasticsearch/setup.cfg +++ b/ext/opentelemetry-ext-elasticsearch/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-elasticsearch -description = OpenTelemetry elasticsearch instrumentation +description = OpenTelemetry elasticsearch integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-jinja2/setup.cfg b/ext/opentelemetry-ext-jinja2/setup.cfg index 10541241ebf..54a7515150f 100644 --- a/ext/opentelemetry-ext-jinja2/setup.cfg +++ b/ext/opentelemetry-ext-jinja2/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-jinja2 -description = OpenTelemetry jinja2 instrumentation +description = OpenTelemetry jinja2 integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-mysql/setup.cfg b/ext/opentelemetry-ext-mysql/setup.cfg index 99a8374e75d..ceb985e8b41 100644 --- a/ext/opentelemetry-ext-mysql/setup.cfg +++ b/ext/opentelemetry-ext-mysql/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-mysql -description = OpenTelemetry MySQL instrumentation +description = OpenTelemetry MySQL integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-psycopg2/setup.cfg b/ext/opentelemetry-ext-psycopg2/setup.cfg index 78ee1b147a5..bb0fd9a57c4 100644 --- a/ext/opentelemetry-ext-psycopg2/setup.cfg +++ b/ext/opentelemetry-ext-psycopg2/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-psycopg2 -description = OpenTelemetry psycopg2 instrumentation +description = OpenTelemetry psycopg2 integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymemcache/setup.cfg b/ext/opentelemetry-ext-pymemcache/setup.cfg index f6fcc0f70f9..c2252274b1f 100644 --- a/ext/opentelemetry-ext-pymemcache/setup.cfg +++ b/ext/opentelemetry-ext-pymemcache/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymemcache -description = OpenTelemetry pymemcache instrumentation +description = OpenTelemetry pymemcache integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymongo/setup.cfg b/ext/opentelemetry-ext-pymongo/setup.cfg index c2055f65ced..5e08d987763 100644 --- a/ext/opentelemetry-ext-pymongo/setup.cfg +++ b/ext/opentelemetry-ext-pymongo/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymongo -description = OpenTelemetry pymongo instrumentation +description = OpenTelemetry pymongo integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pymysql/setup.cfg b/ext/opentelemetry-ext-pymysql/setup.cfg index dedebed1ede..db28ef9581e 100644 --- a/ext/opentelemetry-ext-pymysql/setup.cfg +++ b/ext/opentelemetry-ext-pymysql/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pymysql -description = OpenTelemetry PyMySQL instrumentation +description = OpenTelemetry PyMySQL integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-pyramid/setup.cfg b/ext/opentelemetry-ext-pyramid/setup.cfg index 3350a0c6c9d..bcdf850e87c 100644 --- a/ext/opentelemetry-ext-pyramid/setup.cfg +++ b/ext/opentelemetry-ext-pyramid/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-pyramid -description = OpenTelemetry Pyramid instrumentation +description = OpenTelemetry Pyramid integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-requests/setup.cfg b/ext/opentelemetry-ext-requests/setup.cfg index 3d3f9f19189..714a1b3231a 100644 --- a/ext/opentelemetry-ext-requests/setup.cfg +++ b/ext/opentelemetry-ext-requests/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-requests -description = OpenTelemetry requests instrumentation +description = OpenTelemetry requests integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors diff --git a/ext/opentelemetry-ext-sqlite3/setup.cfg b/ext/opentelemetry-ext-sqlite3/setup.cfg index 6eff4b1e688..95f60988eab 100644 --- a/ext/opentelemetry-ext-sqlite3/setup.cfg +++ b/ext/opentelemetry-ext-sqlite3/setup.cfg @@ -14,7 +14,7 @@ # [metadata] name = opentelemetry-ext-sqlite3 -description = OpenTelemetry SQLite3 instrumentation +description = OpenTelemetry SQLite3 integration long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors From 1472931e9899dbed6f4a62f561d132a8d3504a1b Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 14:01:00 -0700 Subject: [PATCH 07/13] rename --- docs/examples/opencensus-exporter-metrics/collector.py | 2 +- docs/examples/opencensus-exporter-tracer/collector.py | 2 +- docs/examples/opentracing/main.py | 2 +- docs/getting_started/prometheus_example.py | 2 +- .../src/opentelemetry/exporter/jaeger/__init__.py | 4 ++-- .../tests/test_jaeger_exporter.py | 4 ++-- .../exporter/opencensus/metrics_exporter/__init__.py | 2 +- .../exporter/opencensus/trace_exporter/__init__.py | 2 +- .../src/opentelemetry/exporter/opencensus/util.py | 2 +- .../tests/test_otcollector_metrics_exporter.py | 4 ++-- .../tests/test_otcollector_trace_exporter.py | 6 +++--- .../src/opentelemetry/exporter/otlp/__init__.py | 2 +- .../tests/test_otlp_trace_exporter.py | 10 +++++----- .../src/opentelemetry/exporter/prometheus/__init__.py | 2 +- .../tests/test_prometheus_exporter.py | 4 ++-- .../tests/test_zipkin_exporter.py | 2 +- .../opencensus/test_opencensusexporter_functional.py | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/examples/opencensus-exporter-metrics/collector.py b/docs/examples/opencensus-exporter-metrics/collector.py index 725f07b77ab..dc39f0cf4cd 100644 --- 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/collector.py b/docs/examples/opencensus-exporter-tracer/collector.py index 3f0c18aaf75..d404cfbce5f 100644 --- 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 index 8586e0b789e..83cc8f86918 100755 --- a/docs/examples/opentracing/main.py +++ b/docs/examples/opentracing/main.py @@ -2,7 +2,7 @@ from opentelemetry import trace from opentelemetry.ext import opentracing_shim -from opentelemetry.ext.jaeger import JaegerSpanExporter +from opentelemetry.exporter.jaeger import JaegerSpanExporter from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor from rediscache import RedisCache diff --git a/docs/getting_started/prometheus_example.py b/docs/getting_started/prometheus_example.py index ce658d3419f..0377e570b86 100644 --- a/docs/getting_started/prometheus_example.py +++ b/docs/getting_started/prometheus_example.py @@ -19,7 +19,7 @@ from prometheus_client import start_http_server from opentelemetry import metrics -from opentelemetry.ext.prometheus import PrometheusMetricsExporter +from opentelemetry.exporter.prometheus import PrometheusMetricsExporter from opentelemetry.sdk.metrics import Counter, MeterProvider from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter from opentelemetry.sdk.metrics.export.controller import PushController diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py index f12031d510b..d9780a67432 100644 --- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py +++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py @@ -69,8 +69,8 @@ from thrift.transport import THttpClient, TTransport import opentelemetry.trace as trace_api -from opentelemetry.ext.jaeger.gen.agent import Agent as agent -from opentelemetry.ext.jaeger.gen.jaeger import Collector as jaeger +from opentelemetry.exporter.jaeger.gen.agent import Agent as agent +from opentelemetry.exporter.jaeger.gen.jaeger import Collector as jaeger from opentelemetry.sdk.trace.export import Span, SpanExporter, SpanExportResult from opentelemetry.trace.status import StatusCanonicalCode diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py index 7bca8e83178..30b7c85826a 100644 --- a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py +++ b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter.py @@ -18,9 +18,9 @@ # pylint:disable=no-name-in-module # pylint:disable=import-error -import opentelemetry.ext.jaeger as jaeger_exporter +import opentelemetry.exporter.jaeger as jaeger_exporter from opentelemetry import trace as trace_api -from opentelemetry.ext.jaeger.gen.jaeger import ttypes as jaeger +from opentelemetry.exporter.jaeger.gen.jaeger import ttypes as jaeger from opentelemetry.sdk import trace from opentelemetry.sdk.trace import Resource from opentelemetry.trace.status import Status, StatusCanonicalCode diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py index bb1a1ee888c..e83e779df67 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/metrics_exporter/__init__.py @@ -24,7 +24,7 @@ ) from opencensus.proto.metrics.v1 import metrics_pb2 -import opentelemetry.ext.opencensusexporter.util as utils +import opentelemetry.exporter.opencensus.util as utils from opentelemetry.sdk.metrics import Counter, Metric from opentelemetry.sdk.metrics.export import ( MetricRecord, diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py index adadef1666f..e5eb4eaf770 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py @@ -24,7 +24,7 @@ ) from opencensus.proto.trace.v1 import trace_pb2 -import opentelemetry.ext.opencensusexporter.util as utils +import opentelemetry.exporter.opencensus.util as utils from opentelemetry.sdk.trace import Span from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py index 88ff6258f7d..9b9e7201906 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py @@ -21,7 +21,7 @@ from opencensus.proto.agent.common.v1 import common_pb2 from opencensus.proto.trace.v1 import trace_pb2 -from opentelemetry.ext.opencensusexporter.version import ( +from opentelemetry.exporter.opencensus.version import ( __version__ as opencensusexporter_exporter_version, ) from opentelemetry.trace import SpanKind diff --git a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py index f538e5acecd..eddaf963608 100644 --- a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py +++ b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_metrics_exporter.py @@ -20,7 +20,7 @@ from opencensus.proto.metrics.v1 import metrics_pb2 from opentelemetry import metrics -from opentelemetry.ext.opencensusexporter import metrics_exporter +from opentelemetry.exporter.opencensus import metrics_exporter from opentelemetry.sdk.metrics import ( Counter, MeterProvider, @@ -47,7 +47,7 @@ def setUpClass(cls): def test_constructor(self): mock_get_node = mock.Mock() patch = mock.patch( - "opentelemetry.ext.opencensusexporter.util.get_node", + "opentelemetry.exporter.opencensus.util.get_node", side_effect=mock_get_node, ) service_name = "testServiceName" diff --git a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py index 0801d6d0c1b..d07fd053b45 100644 --- a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py +++ b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py @@ -19,9 +19,9 @@ from google.protobuf.timestamp_pb2 import Timestamp from opencensus.proto.trace.v1 import trace_pb2 -import opentelemetry.ext.opencensusexporter.util as utils +import opentelemetry.exporter.opencensus.util as utils from opentelemetry import trace as trace_api -from opentelemetry.ext.opencensusexporter.trace_exporter import ( +from opentelemetry.exporter.opencensus.trace_exporter import ( OpenCensusSpanExporter, translate_to_collector, ) @@ -35,7 +35,7 @@ class TestCollectorSpanExporter(unittest.TestCase): def test_constructor(self): mock_get_node = mock.Mock() patch = mock.patch( - "opentelemetry.ext.opencensusexporter.util.get_node", + "opentelemetry.exporter.opencensus.util.get_node", side_effect=mock_get_node, ) service_name = "testServiceName" diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py index 1b315c5847a..dca0042a68d 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py @@ -29,7 +29,7 @@ .. code:: python from opentelemetry import trace - from opentelemetry.ext.otlp.trace_exporter import OTLPSpanExporter + from opentelemetry.exporter.otlp.trace_exporter import OTLPSpanExporter from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchExportSpanProcessor diff --git a/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py index 3e7affb2213..c7e26508b25 100644 --- a/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py +++ b/exporter/opentelemetry-exporter-otlp/tests/test_otlp_trace_exporter.py @@ -21,7 +21,7 @@ from google.rpc.error_details_pb2 import RetryInfo from grpc import StatusCode, server -from opentelemetry.ext.otlp.trace_exporter import OTLPSpanExporter +from opentelemetry.exporter.otlp.trace_exporter import OTLPSpanExporter from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import ( ExportTraceServiceRequest, ExportTraceServiceResponse, @@ -142,8 +142,8 @@ def setUp(self): def tearDown(self): self.server.stop(None) - @patch("opentelemetry.ext.otlp.trace_exporter.expo") - @patch("opentelemetry.ext.otlp.trace_exporter.sleep") + @patch("opentelemetry.exporter.otlp.trace_exporter.expo") + @patch("opentelemetry.exporter.otlp.trace_exporter.sleep") def test_unavailable(self, mock_sleep, mock_expo): mock_expo.configure_mock(**{"return_value": [1]}) @@ -156,8 +156,8 @@ def test_unavailable(self, mock_sleep, mock_expo): ) mock_sleep.assert_called_with(1) - @patch("opentelemetry.ext.otlp.trace_exporter.expo") - @patch("opentelemetry.ext.otlp.trace_exporter.sleep") + @patch("opentelemetry.exporter.otlp.trace_exporter.expo") + @patch("opentelemetry.exporter.otlp.trace_exporter.sleep") def test_unavailable_delay(self, mock_sleep, mock_expo): mock_expo.configure_mock(**{"return_value": [1]}) diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py index da22042dcc5..e03c23a99e1 100644 --- a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py +++ b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/__init__.py @@ -27,7 +27,7 @@ .. code:: python from opentelemetry import metrics - from opentelemetry.ext.prometheus import PrometheusMetricsExporter + from opentelemetry.exporter.prometheus import PrometheusMetricsExporter from opentelemetry.sdk.metrics import Counter, Meter from prometheus_client import start_http_server diff --git a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py index 2ba6b701215..d624086ce3c 100644 --- a/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py +++ b/exporter/opentelemetry-exporter-prometheus/tests/test_prometheus_exporter.py @@ -17,7 +17,7 @@ from prometheus_client.core import CounterMetricFamily -from opentelemetry.ext.prometheus import ( +from opentelemetry.exporter.prometheus import ( CustomCollector, PrometheusMetricsExporter, ) @@ -122,7 +122,7 @@ def test_invalid_metric(self): collector = CustomCollector("testprefix") collector.add_metrics_data([record]) collector.collect() - self.assertLogs("opentelemetry.ext.prometheus", level="WARNING") + self.assertLogs("opentelemetry.exporter.prometheus", level="WARNING") def test_sanitize(self): collector = CustomCollector("testprefix") diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py index 1f2d53d3048..9f6da2e240f 100644 --- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py +++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py @@ -17,7 +17,7 @@ from unittest.mock import MagicMock, patch from opentelemetry import trace as trace_api -from opentelemetry.ext.zipkin import ZipkinSpanExporter +from opentelemetry.exporter.zipkin import ZipkinSpanExporter from opentelemetry.sdk import trace from opentelemetry.sdk.trace import Resource from opentelemetry.sdk.trace.export import SpanExportResult diff --git a/ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py b/ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py index af0f049bb02..c7948917834 100644 --- a/ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py +++ b/ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py @@ -14,7 +14,7 @@ from opentelemetry import trace from opentelemetry.context import attach, detach, set_value -from opentelemetry.ext.opencensusexporter.trace_exporter import ( +from opentelemetry.exporter.opencensus.trace_exporter import ( OpenCensusSpanExporter, ) from opentelemetry.sdk.trace import TracerProvider From aaf24e57d87c2cafdbd008c66ea3c77e111f75b7 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 14:17:49 -0700 Subject: [PATCH 08/13] lint --- docs/examples/opentracing/main.py | 2 +- docs/getting_started/jaeger_example.py | 2 +- .../tests/test_datadog_exporter.py | 2 +- .../examples/jaeger_exporter_example.py | 2 +- .../src/opentelemetry/exporter/jaeger/__init__.py | 2 +- .../src/opentelemetry/exporter/zipkin/__init__.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py index 83cc8f86918..9ecbbba8ca4 100755 --- 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.ext import opentracing_shim from opentelemetry.exporter.jaeger import JaegerSpanExporter +from opentelemetry.ext import opentracing_shim from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor from rediscache import RedisCache diff --git a/docs/getting_started/jaeger_example.py b/docs/getting_started/jaeger_example.py index 8ddb4a0586d..f9c8e5cd059 100644 --- a/docs/getting_started/jaeger_example.py +++ b/docs/getting_started/jaeger_example.py @@ -14,7 +14,7 @@ # jaeger_example.py from opentelemetry import trace -from opentelemetry.ext import jaeger +from opentelemetry.exporter import jaeger from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchExportSpanProcessor diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py index 5306d517b76..a3e67790d97 100644 --- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py +++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py @@ -21,7 +21,7 @@ from ddtrace.internal.writer import AgentWriter from opentelemetry import trace as trace_api -from opentelemetry.ext import datadog +from opentelemetry.exporter import datadog from opentelemetry.sdk import trace from opentelemetry.sdk.util.instrumentation import InstrumentationInfo diff --git a/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py b/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py index 1aca62fc23f..68453fd9fac 100644 --- a/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py +++ b/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py @@ -1,7 +1,7 @@ import time from opentelemetry import trace -from opentelemetry.ext import jaeger +from opentelemetry.exporter import jaeger from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchExportSpanProcessor diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py index d9780a67432..993bf4f0872 100644 --- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py +++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py @@ -25,7 +25,7 @@ .. code:: python from opentelemetry import trace - from opentelemetry.ext import jaeger + from opentelemetry.exporter import jaeger from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchExportSpanProcessor diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py index 8a487290ce1..10bd6e93e97 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py @@ -28,7 +28,7 @@ .. code:: python from opentelemetry import trace - from opentelemetry.ext import zipkin + from opentelemetry.exporter import zipkin from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchExportSpanProcessor From 7a30143fb1c3cbf2a28ed1d32edf2d815466811e Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 14:30:01 -0700 Subject: [PATCH 09/13] datadog --- docs/examples/datadog_exporter/basic_example.py | 2 +- docs/examples/datadog_exporter/client.py | 2 +- docs/examples/datadog_exporter/server.py | 4 ++-- .../src/opentelemetry/exporter/datadog/__init__.py | 4 ++-- .../tests/test_datadog_format.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/examples/datadog_exporter/basic_example.py b/docs/examples/datadog_exporter/basic_example.py index a41f9e0462c..5eb470719b7 100644 --- 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 index 3969ef04d9a..2570c426d5f 100644 --- 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 index e2099fdf25c..15d10f34934 100644 --- 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/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py index 85bdaea40aa..7adde5df500 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py @@ -35,8 +35,8 @@ .. code:: python from opentelemetry import propagators, trace - from opentelemetry.ext.datadog import DatadogExportSpanProcessor, DatadogSpanExporter - from opentelemetry.ext.datadog.propagator import DatadogFormat + from opentelemetry.exporter.datadog import DatadogExportSpanProcessor, DatadogSpanExporter + from opentelemetry.exporter.datadog.propagator import DatadogFormat from opentelemetry.sdk.trace import TracerProvider trace.set_tracer_provider(TracerProvider()) diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py index 31633f83701..1a398745b8d 100644 --- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py +++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_format.py @@ -15,7 +15,7 @@ import unittest from opentelemetry import trace as trace_api -from opentelemetry.ext.datadog import constants, propagator +from opentelemetry.exporter.datadog import constants, propagator from opentelemetry.sdk import trace from opentelemetry.trace import get_current_span, set_span_in_context From 5249771ea109334ea026e1e1d45688dbe9240899 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 14:48:29 -0700 Subject: [PATCH 10/13] flake --- .flake8 | 4 ++-- docs/conf.py | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.flake8 b/.flake8 index 8555d626c6f..5ab69e53e0a 100644 --- 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 index 74ae754c60c..d3af10b7d66 100644 --- 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 ----------------------------------------------------- From fb9e3db2dc36fbf941a2d1b60f5595f3afecac5c Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 15:07:44 -0700 Subject: [PATCH 11/13] toctree --- docs/index.rst | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index b25efa8acc6..b59af3a003c 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -72,8 +72,16 @@ install .. toctree:: :maxdepth: 2 - :caption: OpenTelemetry Integrations - :name: integrations + :caption: OpenTelemetry Exporters + :name: exporters + :glob: + + exporter/** + +.. toctree:: + :maxdepth: 2 + :caption: OpenTelemetry Instrumentations + :name: Instrumentations :glob: ext/** From c1da72db4f6f8719c5078e523b34d89be4268f00 Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Tue, 28 Jul 2020 15:23:51 -0700 Subject: [PATCH 12/13] docs --- docs/examples/cloud_monitoring/README.rst | 48 ----------- .../cloud_monitoring/basic_metrics.py | 43 ---------- docs/examples/cloud_trace_exporter/README.rst | 79 ------------------- .../cloud_trace_exporter/basic_trace.py | 14 ---- .../opencensus-exporter-metrics/README.rst | 4 +- .../opencensus-exporter-tracer/README.rst | 4 +- 6 files changed, 4 insertions(+), 188 deletions(-) delete mode 100644 docs/examples/cloud_monitoring/README.rst delete mode 100644 docs/examples/cloud_monitoring/basic_metrics.py delete mode 100644 docs/examples/cloud_trace_exporter/README.rst delete mode 100644 docs/examples/cloud_trace_exporter/basic_trace.py diff --git a/docs/examples/cloud_monitoring/README.rst b/docs/examples/cloud_monitoring/README.rst deleted file mode 100644 index 818446dc157..00000000000 --- a/docs/examples/cloud_monitoring/README.rst +++ /dev/null @@ -1,48 +0,0 @@ -Cloud Monitoring Exporter Example -================================= - -These examples show how to use OpenTelemetry to send metrics data to Cloud Monitoring. - - -Basic Example -------------- - -To use this exporter you first need to: - * `Create a Google Cloud project `_. - * Enable the Cloud Monitoring API (aka Stackdriver Monitoring API) in the project `here `_. - * Enable `Default Application Credentials `_. - -* Installation - -.. code-block:: sh - - pip install opentelemetry-api - pip install opentelemetry-sdk - pip install opentelemetry-exporter-cloud-monitoring - -* Run example - -.. literalinclude:: basic_metrics.py - :language: python - :lines: 1- - -Viewing Output --------------------------- - -After running the example: - * Go to the `Cloud Monitoring Metrics Explorer page `_. - * In "Find resource type and metric" enter "OpenTelemetry/request_counter". - * You can filter by labels and change the graphical output here as well. - -Troubleshooting --------------------------- - -``One or more points were written more frequently than the maximum sampling period configured for the metric`` -############################################################################################################## - -Currently, Cloud Monitoring allows one write every 10 seconds for any unique tuple (metric_name, metric_label_value_1, metric_label_value_2, ...). The exporter should rate limit on its own but issues arise if: - - * You are restarting the server more than once every 10 seconds. - * You have a multiple exporters (possibly on different threads) writing to the same tuple. - -For both cases, you can pass ``add_unique_identifier=True`` to the CloudMonitoringMetricsExporter constructor. This adds a UUID label_value, making the tuple unique again. For the first case, you can also choose to just wait longer than 10 seconds between restarts. diff --git a/docs/examples/cloud_monitoring/basic_metrics.py b/docs/examples/cloud_monitoring/basic_metrics.py deleted file mode 100644 index fa00fc068b6..00000000000 --- a/docs/examples/cloud_monitoring/basic_metrics.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python3 -# Copyright The OpenTelemetry Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import time - -from opentelemetry import metrics -from opentelemetry.exporter.cloud_monitoring import ( - CloudMonitoringMetricsExporter, -) -from opentelemetry.sdk.metrics import Counter, MeterProvider - -metrics.set_meter_provider(MeterProvider()) -meter = metrics.get_meter(__name__) -metrics.get_meter_provider().start_pipeline( - meter, CloudMonitoringMetricsExporter(), 5 -) - -requests_counter = meter.create_metric( - name="request_counter", - description="number of requests", - unit="1", - value_type=int, - metric_type=Counter, - label_keys=("environment"), -) - -staging_labels = {"environment": "staging"} - -for i in range(20): - requests_counter.add(25, staging_labels) - time.sleep(10) diff --git a/docs/examples/cloud_trace_exporter/README.rst b/docs/examples/cloud_trace_exporter/README.rst deleted file mode 100644 index 65674759b61..00000000000 --- a/docs/examples/cloud_trace_exporter/README.rst +++ /dev/null @@ -1,79 +0,0 @@ -Cloud Trace Exporter Example -============================ - -These examples show how to use OpenTelemetry to send tracing data to Cloud Trace. - - -Basic Example -------------- - -To use this exporter you first need to: - * A Google Cloud project. You can `create one here `_. - * Enable Cloud Trace API (listed in the Cloud Console as Stackdriver Trace API) in the project `here `_. - * If the page says "API Enabled" then you're done! No need to do anything. - * Enable Default Application Credentials by creating setting `GOOGLE_APPLICATION_CREDENTIALS `_ or by `installing gcloud sdk `_ and calling ``gcloud auth application-default login``. - -* Installation - -.. code-block:: sh - - pip install opentelemetry-api - pip install opentelemetry-sdk - pip install opentelemetry-exporter-cloud-trace - -* Run an example locally - -.. literalinclude:: basic_trace.py - :language: python - :lines: 1- - -Checking Output --------------------------- - -After running any of these examples, you can go to `Cloud Trace overview `_ to see the results. - - -Further Reading --------------------------- - -* `More information about exporters in general `_ - -Troubleshooting --------------------------- - -Running basic_trace.py hangs: -############################# - * Make sure you've setup Application Default Credentials. Either run ``gcloud auth application-default login`` or set the ``GOOGLE_APPLICATION_CREDENTIALS`` environment variable to be a path to a service account token file. - -Getting error ``google.api_core.exceptions.ResourceExhausted: 429 Resource has been exhausted``: -################################################################################################ - * Check that you've enabled the `Cloud Trace (Stackdriver Trace) API `_ - -bash: pip: command not found: -############################# - * `Install pip `_ - * If your machine uses python2 by default, pip will also be the python2 version. Try using ``pip3`` instead of ``pip``. - -pip install is hanging -###################### -Try upgrading pip - -.. code-block:: sh - - pip install --upgrade pip - -``pip install grcpio`` has been known to hang when you aren't using an upgraded version. - -ImportError: No module named opentelemetry -########################################## -Make sure you are using python3. If - -.. code-block:: sh - - python --version - -returns ``Python 2.X.X`` try calling - -.. code-block:: sh - - python3 basic_trace.py diff --git a/docs/examples/cloud_trace_exporter/basic_trace.py b/docs/examples/cloud_trace_exporter/basic_trace.py deleted file mode 100644 index 76840a291ec..00000000000 --- a/docs/examples/cloud_trace_exporter/basic_trace.py +++ /dev/null @@ -1,14 +0,0 @@ -from opentelemetry import trace -from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter -from opentelemetry.sdk.trace import TracerProvider -from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor - -trace.set_tracer_provider(TracerProvider()) - -cloud_trace_exporter = CloudTraceSpanExporter() -trace.get_tracer_provider().add_span_processor( - SimpleExportSpanProcessor(cloud_trace_exporter) -) -tracer = trace.get_tracer(__name__) -with tracer.start_as_current_span("foo"): - print("Hello world!") diff --git a/docs/examples/opencensus-exporter-metrics/README.rst b/docs/examples/opencensus-exporter-metrics/README.rst index 30961e061df..0a71685ee9f 100644 --- 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-tracer/README.rst b/docs/examples/opencensus-exporter-tracer/README.rst index 00199943086..d147f008d49 100644 --- 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 From 10e4314337f5d7b888779525ae63ec0eb0b598ef Mon Sep 17 00:00:00 2001 From: Leighton Chen Date: Wed, 29 Jul 2020 09:50:42 -0700 Subject: [PATCH 13/13] jaeger --- .flake8 | 2 +- .github/workflows/docs.yml | 1 + docs/examples/datadog_exporter/README.rst | 4 ++-- docs/examples/opentracing/requirements.txt | 2 +- exporter/opentelemetry-exporter-jaeger/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-otlp/CHANGELOG.md | 5 +++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.flake8 b/.flake8 index 5ab69e53e0a..2780677a643 100644 --- a/.flake8 +++ b/.flake8 @@ -17,7 +17,7 @@ exclude = target __pycache__ exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/ - exporter/opentelemetry-ext-jaeger/build/* + exporter/opentelemetry-exporter-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/.github/workflows/docs.yml b/.github/workflows/docs.yml index 59c825e7e28..1860c696a0c 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,6 +6,7 @@ on: - master paths: - 'docs/**' + - 'exporter/**' - 'ext/**' - 'opentelemetry-python/opentelemetry-api/src/opentelemetry/**' - 'opentelemetry-python/opentelemetry-sdk/src/opentelemetry/sdk/**' diff --git a/docs/examples/datadog_exporter/README.rst b/docs/examples/datadog_exporter/README.rst index d851550b279..250eec2b84a 100644 --- a/docs/examples/datadog_exporter/README.rst +++ b/docs/examples/datadog_exporter/README.rst @@ -13,7 +13,7 @@ Basic Example pip install opentelemetry-api pip install opentelemetry-sdk - pip install opentelemetry-ext-datadog + pip install opentelemetry-exporter-datadog * Start Datadog Agent @@ -48,7 +48,7 @@ Distributed Example pip install opentelemetry-api pip install opentelemetry-sdk - pip install opentelemetry-ext-datadog + pip install opentelemetry-exporter-datadog pip install opentelemetry-instrumentation pip install opentelemetry-ext-flask pip install flask diff --git a/docs/examples/opentracing/requirements.txt b/docs/examples/opentracing/requirements.txt index d87842f4d89..fa4b520936d 100644 --- a/docs/examples/opentracing/requirements.txt +++ b/docs/examples/opentracing/requirements.txt @@ -1,6 +1,6 @@ opentelemetry-api opentelemetry-sdk -opentelemetry-ext-jaeger +opentelemetry-exporter-jaeger opentelemetry-opentracing-shim redis redis_opentracing diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg index fc581301b6f..b660e8ec1c1 100644 --- a/exporter/opentelemetry-exporter-jaeger/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-jaeger +name = opentelemetry-exporter-jaeger description = Jaeger Exporter for OpenTelemetry long_description = file: README.rst long_description_content_type = text/x-rst author = OpenTelemetry Authors author_email = cncf-opentelemetry-contributors@lists.cncf.io -url = https://github.com/open-telemetry/opentelemetry-python/tree/master/ext/opentelemetry-ext-jaeger +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter/opentelemetry-exporter-jaeger platforms = any license = Apache-2.0 classifiers = diff --git a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md index 878e7a14bca..bcaa7d11811 100644 --- a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md @@ -2,13 +2,14 @@ ## Unreleased +- Change package name to opentelemetry-exporter-otlp + ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) + ## Version 0.11b0 Released 2020-07-28 - Update span exporter to use OpenTelemetry Proto v0.4.0 ([#872](https://github.com/open-telemetry/opentelemetry-python/pull/889)) -- Change package name to opentelemetry-exporter-otlp - ([#953](https://github.com/open-telemetry/opentelemetry-python/pull/953)) ## 0.9b0