diff --git a/README.md b/README.md index a402e5c73e9..cc6b7f10b66 100644 --- a/README.md +++ b/README.md @@ -63,12 +63,19 @@ pip install opentelemetry-sdk ``` The -[`ext/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/ext) -directory includes OpenTelemetry integration packages, which can be installed -separately as: +[`instrumentation/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation) +directory includes OpenTelemetry instrumentation packages, which can be installed separately as: ```sh -pip install opentelemetry-ext-{integration} +pip install opentelemetry-instrumentation-{instrumentation} +``` + +The +[`exporter/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/exporter) +directory includes OpenTelemetry exporter packages, which can be installed separately as: + +```sh +pip install opentelemetry-exporter-{exporter} ``` To install the development versions of these packages instead, clone or fork @@ -78,7 +85,7 @@ install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs) ```sh pip install -e ./opentelemetry-api pip install -e ./opentelemetry-sdk -pip install -e ./ext/opentelemetry-ext-{integration} +pip install -e ./ext/opentelemetry-instrumentation-{instrumentation} ``` ## Documentation diff --git a/docs/conf.py b/docs/conf.py index db836ea27ef..4b9753c96c4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -37,13 +37,6 @@ 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)) -] - instr = "../instrumentation" instr_dirs = [ os.path.abspath("/".join(["../instrumentation", f, "src"])) @@ -51,7 +44,7 @@ if isdir(join(instr, f)) ] -sys.path[:0] = source_dirs + exp_dirs + ext_dirs + instr_dirs +sys.path[:0] = source_dirs + exp_dirs + instr_dirs # -- Project information ----------------------------------------------------- diff --git a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py index 7457c63148f..59dd1fa6108 100755 --- a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py +++ b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_client.py @@ -17,11 +17,11 @@ """The Python implementation of the GRPC helloworld.Greeter client. -Note that you need ``opentelemetry-ext-grpc`` and ``protobuf`` to be installed +Note that you need ``opentelemetry-instrumentation-grpc`` and ``protobuf`` to be installed to run these examples. To run this script in the context of the example app, install ``opentelemetry-example-app``:: - pip install -e ext/opentelemetry-ext-grpc/ + pip install -e ext/opentelemetry-instrumentation-grpc/ pip install -e docs/examples/opentelemetry-example-app Then run the server in one shell:: @@ -42,8 +42,8 @@ import grpc from opentelemetry import trace -from opentelemetry.ext.grpc import client_interceptor -from opentelemetry.ext.grpc.grpcext import intercept_channel +from opentelemetry.instrumentation.grpc import client_interceptor +from opentelemetry.instrumentation.grpc.grpcext import intercept_channel from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, diff --git a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py index 858426a4682..ae4562e5817 100755 --- a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py +++ b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/hello_world_server.py @@ -17,11 +17,11 @@ """The Python implementation of the GRPC helloworld.Greeter server. -Note that you need ``opentelemetry-ext-grpc`` and ``protobuf`` to be installed +Note that you need ``opentelemetry-instrumentation-grpc`` and ``protobuf`` to be installed to run these examples. To run this script in the context of the example app, install ``opentelemetry-example-app``:: - pip install -e ext/opentelemetry-ext-grpc/ + pip install -e ext/opentelemetry-instrumentation-grpc/ pip install -e docs/examples/opentelemetry-example-app Then run the server in one shell:: @@ -42,8 +42,8 @@ import grpc from opentelemetry import trace -from opentelemetry.ext.grpc import server_interceptor -from opentelemetry.ext.grpc.grpcext import intercept_server +from opentelemetry.instrumentation.grpc import server_interceptor +from opentelemetry.instrumentation.grpc.grpcext import intercept_server from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, diff --git a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py index d24875913d2..110c68d113c 100755 --- a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py +++ b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_client.py @@ -17,11 +17,11 @@ """The Python implementation of the gRPC route guide client. -Note that you need ``opentelemetry-ext-grpc`` and ``protobuf`` to be installed +Note that you need ``opentelemetry-instrumentation-grpc`` and ``protobuf`` to be installed to run these examples. To run this script in the context of the example app, install ``opentelemetry-example-app``:: - pip install -e ext/opentelemetry-ext-grpc/ + pip install -e ext/opentelemetry-instrumentation-grpc/ pip install -e docs/examples/opentelemetry-example-app Then run the server in one shell:: @@ -43,8 +43,8 @@ import grpc from opentelemetry import trace -from opentelemetry.ext.grpc import client_interceptor -from opentelemetry.ext.grpc.grpcext import intercept_channel +from opentelemetry.instrumentation.grpc import client_interceptor +from opentelemetry.instrumentation.grpc.grpcext import intercept_channel from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, diff --git a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py index 54a68b9f5a9..a8b2a95e819 100755 --- a/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py +++ b/docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/route_guide_server.py @@ -18,11 +18,11 @@ """The Python implementation of the gRPC route guide server. -Note that you need ``opentelemetry-ext-grpc`` and ``protobuf`` to be installed +Note that you need ``opentelemetry-instrumentation-grpc`` and ``protobuf`` to be installed to run these examples. To run this script in the context of the example app, install ``opentelemetry-example-app``:: - pip install -e ext/opentelemetry-ext-grpc/ + pip install -e ext/opentelemetry-instrumentation-grpc/ pip install -e docs/examples/opentelemetry-example-app Then run the server in one shell:: @@ -45,8 +45,8 @@ import grpc from opentelemetry import trace -from opentelemetry.ext.grpc import server_interceptor -from opentelemetry.ext.grpc.grpcext import intercept_server +from opentelemetry.instrumentation.grpc import server_interceptor +from opentelemetry.instrumentation.grpc.grpcext import intercept_server from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, diff --git a/docs/examples/opentracing/README.rst b/docs/examples/opentracing/README.rst index 06c767b1997..f56bd3e5fcd 100644 --- a/docs/examples/opentracing/README.rst +++ b/docs/examples/opentracing/README.rst @@ -1,8 +1,8 @@ OpenTracing Shim Example ========================== -This example shows how to use the :doc:`opentelemetry-ext-opentracing-shim -package <../../ext/opentracing_shim/opentracing_shim>` +This example shows how to use the :doc:`opentelemetry-instrumentation-opentracing-shim +package <../../instrumentation/opentracing_shim/opentracing_shim>` to interact with libraries instrumented with `opentracing-python `_. @@ -61,7 +61,7 @@ Alternatively, you can install the Python dependencies separately: pip install \ opentelemetry-api \ opentelemetry-sdk \ - opentelemetry-ext-jaeger \ + opentelemetry-exporter-jaeger \ opentelemetry-opentracing-shim \ redis \ redis_opentracing @@ -100,6 +100,6 @@ Useful links ------------ - OpenTelemetry_ -- :doc:`../../ext/opentracing_shim/opentracing_shim` +- :doc:`../../instrumentation/opentracing_shim/opentracing_shim` .. _OpenTelemetry: https://github.com/open-telemetry/opentelemetry-python/ diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py index 9ecbbba8ca4..0653ca82ece 100755 --- a/docs/examples/opentracing/main.py +++ b/docs/examples/opentracing/main.py @@ -2,7 +2,7 @@ from opentelemetry import trace from opentelemetry.exporter.jaeger import JaegerSpanExporter -from opentelemetry.ext import opentracing_shim +from opentelemetry.instrumentation import opentracing_shim from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor from rediscache import RedisCache diff --git a/docs/ext/boto/boto.rst b/docs/ext/boto/boto.rst deleted file mode 100644 index 8bf40c75665..00000000000 --- a/docs/ext/boto/boto.rst +++ /dev/null @@ -1,7 +0,0 @@ -OpenTelemetry Boto Integration -============================== - -.. automodule:: opentelemetry.ext.boto - :members: - :undoc-members: - :show-inheritance: diff --git a/docs/getting-started.rst b/docs/getting-started.rst index 11e3a08fecf..e9dd831e908 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -122,7 +122,7 @@ for Jaeger, but you can install that as a separate package: .. code-block:: sh - pip install opentelemetry-ext-jaeger + pip install opentelemetry-exporter-jaeger Once installed, update your code to import the Jaeger exporter, and use that instead: @@ -228,7 +228,7 @@ For our Python application, we will need to install an exporter specific to Prom .. code-block:: sh - pip install opentelemetry-ext-prometheus + pip install opentelemetry-exporter-prometheus And use that instead of the `ConsoleMetricsExporter`: @@ -289,7 +289,7 @@ Install the OpenTelemetry Collector exporter: .. code-block:: sh - pip install opentelemetry-ext-otcollector + pip install opentelemetry-instrumentation-otcollector And execute the following script: diff --git a/docs/index.rst b/docs/index.rst index 3378daac070..a127bf4c42d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -26,9 +26,11 @@ The API and SDK packages are available on PyPI, and can installed via pip: In addition, there are several extension packages which can be installed separately as:: - pip install opentelemetry-ext-{integration} + pip install opentelemetry-exporter-{exporter} + pip install opentelemetry-instrumentation-{instrumentation} -The extension packages can be found in :scm_web:`ext/ directory of the repository `. +These are for exporter and instrumentation packages respectively. +The packages can be found in :scm_web:`instrumentation/ directory of the repository `. Extensions ---------- @@ -51,7 +53,7 @@ install cd opentelemetry-python pip install -e ./opentelemetry-api pip install -e ./opentelemetry-sdk - pip install -e ./ext/opentelemetry-ext-{integration} + pip install -e ./instrumentation/opentelemetry-instrumentation-{instrumentation} .. toctree:: @@ -86,14 +88,6 @@ install instrumentation/** -.. toctree:: - :maxdepth: 2 - :caption: OpenTelemetry Integrations - :name: integrations - :glob: - - ext/** - .. toctree:: :maxdepth: 1 :caption: Examples diff --git a/docs/ext/botocore/botocore.rst b/docs/instrumentation/boto/boto.rst similarity index 51% rename from docs/ext/botocore/botocore.rst rename to docs/instrumentation/boto/boto.rst index 43f702a9046..c438c2466ca 100644 --- a/docs/ext/botocore/botocore.rst +++ b/docs/instrumentation/boto/boto.rst @@ -1,7 +1,7 @@ -OpenTelemetry Botocore Integration +OpenTelemetry Boto Instrumentation ================================== -.. automodule:: opentelemetry.ext.botocore +.. automodule:: opentelemetry.instrumentation.boto :members: :undoc-members: :show-inheritance: diff --git a/docs/instrumentation/botocore/botocore.rst b/docs/instrumentation/botocore/botocore.rst new file mode 100644 index 00000000000..eb8ea6bcf76 --- /dev/null +++ b/docs/instrumentation/botocore/botocore.rst @@ -0,0 +1,7 @@ +OpenTelemetry Botocore Instrumentation +====================================== + +.. automodule:: opentelemetry.instrumentation.botocore + :members: + :undoc-members: + :show-inheritance: diff --git a/docs/ext/celery/celery.rst b/docs/instrumentation/celery/celery.rst similarity index 71% rename from docs/ext/celery/celery.rst rename to docs/instrumentation/celery/celery.rst index 125233e006f..c85f3adb59b 100644 --- a/docs/ext/celery/celery.rst +++ b/docs/instrumentation/celery/celery.rst @@ -1,7 +1,7 @@ OpenTelemetry Celery Instrumentation ==================================== -.. automodule:: opentelemetry.ext.celery +.. automodule:: opentelemetry.instrumentation.celery :members: :undoc-members: :show-inheritance: diff --git a/docs/ext/grpc/grpc.rst b/docs/instrumentation/grpc/grpc.rst similarity index 75% rename from docs/ext/grpc/grpc.rst rename to docs/instrumentation/grpc/grpc.rst index 351d3bfb0d5..243f6961439 100644 --- a/docs/ext/grpc/grpc.rst +++ b/docs/instrumentation/grpc/grpc.rst @@ -4,7 +4,7 @@ OpenTelemetry gRPC Instrumentation Module contents --------------- -.. automodule:: opentelemetry.ext.grpc +.. automodule:: opentelemetry.instrumentation.grpc :members: :undoc-members: :show-inheritance: diff --git a/docs/ext/jinja2/jinja2.rst b/docs/instrumentation/jinja2/jinja2.rst similarity index 71% rename from docs/ext/jinja2/jinja2.rst rename to docs/instrumentation/jinja2/jinja2.rst index d9b461627d5..5c7143724c4 100644 --- a/docs/ext/jinja2/jinja2.rst +++ b/docs/instrumentation/jinja2/jinja2.rst @@ -1,7 +1,7 @@ OpenTelemetry Jinja2 Instrumentation ==================================== -.. automodule:: opentelemetry.ext.jinja2 +.. automodule:: opentelemetry.instrumentation.jinja2 :members: :undoc-members: :show-inheritance: diff --git a/docs/ext/opentracing_shim/opentracing_shim.rst b/docs/instrumentation/opentracing_shim/opentracing_shim.rst similarity index 60% rename from docs/ext/opentracing_shim/opentracing_shim.rst rename to docs/instrumentation/opentracing_shim/opentracing_shim.rst index f27974b9c07..fad4e04bbec 100644 --- a/docs/ext/opentracing_shim/opentracing_shim.rst +++ b/docs/instrumentation/opentracing_shim/opentracing_shim.rst @@ -1,5 +1,5 @@ OpenTracing Shim for OpenTelemetry ================================== -.. automodule:: opentelemetry.ext.opentracing_shim +.. automodule:: opentelemetry.instrumentation.opentracing_shim :no-show-inheritance: diff --git a/docs/ext/system_metrics/system_metrics.rst b/docs/instrumentation/system_metrics/system_metrics.rst similarity index 70% rename from docs/ext/system_metrics/system_metrics.rst rename to docs/instrumentation/system_metrics/system_metrics.rst index db6f9da70f4..96b39d9267e 100644 --- a/docs/ext/system_metrics/system_metrics.rst +++ b/docs/instrumentation/system_metrics/system_metrics.rst @@ -1,7 +1,7 @@ OpenTelemetry System Metrics Instrumentation ============================================ -.. automodule:: opentelemetry.ext.system_metrics +.. automodule:: opentelemetry.instrumentation.system_metrics :members: :undoc-members: :show-inheritance: diff --git a/eachdist.ini b/eachdist.ini index abf9e620aab..076c8a4a4af 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -10,7 +10,7 @@ sortfirst= instrumentation/opentelemetry-instrumentation-wsgi instrumentation/opentelemetry-instrumentation-dbapi instrumentation/opentelemetry-instrumentation-asgi - ext/opentelemetry-ext-botocore + instrumentation/opentelemetry-instrumentation-botocore instrumentation/* exporter/* ext/* 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 7adde5df500..5a73c55d69f 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py @@ -21,7 +21,7 @@ :: - pip install opentelemetry-ext-datadog + pip install opentelemetry-exporter-datadog Usage diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py index 7c94e173f74..49dab7c6866 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py @@ -37,8 +37,8 @@ "opentelemetry.instrumentation.dbapi": DatadogSpanTypes.SQL, "opentelemetry.instrumentation.django": DatadogSpanTypes.WEB, "opentelemetry.instrumentation.flask": DatadogSpanTypes.WEB, - "opentelemetry.ext.grpc": DatadogSpanTypes.GRPC, - "opentelemetry.ext.jinja2": DatadogSpanTypes.TEMPLATE, + "opentelemetry.instrumentation.grpc": DatadogSpanTypes.GRPC, + "opentelemetry.instrumentation.jinja2": DatadogSpanTypes.TEMPLATE, "opentelemetry.instrumentation.mysql": DatadogSpanTypes.SQL, "opentelemetry.instrumentation.psycopg2": DatadogSpanTypes.SQL, "opentelemetry.instrumentation.pymemcache": DatadogSpanTypes.CACHE, diff --git a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py index 4b7d2391bc0..45ce9417e1a 100644 --- a/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py +++ b/exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py @@ -294,8 +294,8 @@ def test_span_types(self): "opentelemetry.instrumentation.dbapi", "opentelemetry.instrumentation.django", "opentelemetry.instrumentation.flask", - "opentelemetry.ext.grpc", - "opentelemetry.ext.jinja2", + "opentelemetry.instrumentation.grpc", + "opentelemetry.instrumentation.jinja2", "opentelemetry.instrumentation.mysql", "opentelemetry.instrumentation.psycopg2", "opentelemetry.instrumentation.pymongo", diff --git a/ext/opentelemetry-ext-jinja2/README.rst b/ext/opentelemetry-ext-jinja2/README.rst deleted file mode 100644 index 09e74e21d35..00000000000 --- a/ext/opentelemetry-ext-jinja2/README.rst +++ /dev/null @@ -1,21 +0,0 @@ -OpenTelemetry jinja2 integration -================================ - -|pypi| - -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-jinja2.svg - :target: https://pypi.org/project/opentelemetry-ext-jinja2/ - -Installation ------------- - -:: - - pip install opentelemetry-ext-jinja2 - - -References ----------- - -* `OpenTelemetry jinja2 integration `_ -* `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-jinja2/setup.py b/ext/opentelemetry-ext-jinja2/setup.py deleted file mode 100644 index 323c1b33530..00000000000 --- a/ext/opentelemetry-ext-jinja2/setup.py +++ /dev/null @@ -1,26 +0,0 @@ -# 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 os - -import setuptools - -BASE_DIR = os.path.dirname(__file__) -VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "jinja2", "version.py" -) -PACKAGE_INFO = {} -with open(VERSION_FILENAME) as f: - exec(f.read(), PACKAGE_INFO) - -setuptools.setup(version=PACKAGE_INFO["__version__"]) diff --git a/ext/opentelemetry-ext-system-metrics/CHANGELOG.md b/ext/opentelemetry-ext-system-metrics/CHANGELOG.md deleted file mode 100644 index 12d51bb800c..00000000000 --- a/ext/opentelemetry-ext-system-metrics/CHANGELOG.md +++ /dev/null @@ -1,9 +0,0 @@ -# Changelog - -## Unreleased - -## 0.9b0 - -Released 2020-06-10 - -- Initial release (https://github.com/open-telemetry/opentelemetry-python/pull/652) diff --git a/ext/opentelemetry-ext-system-metrics/setup.py b/ext/opentelemetry-ext-system-metrics/setup.py deleted file mode 100644 index 370399094dd..00000000000 --- a/ext/opentelemetry-ext-system-metrics/setup.py +++ /dev/null @@ -1,26 +0,0 @@ -# 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 os - -import setuptools - -BASE_DIR = os.path.dirname(__file__) -VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "system_metrics", "version.py" -) -PACKAGE_INFO = {} -with open(VERSION_FILENAME) as f: - exec(f.read(), PACKAGE_INFO) - -setuptools.setup(version=PACKAGE_INFO["__version__"]) diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md index 08464e8cd9f..530bc71da75 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-asyncpg - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## Version 0.11b0 diff --git a/ext/opentelemetry-ext-boto/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-boto/CHANGELOG.md similarity index 65% rename from ext/opentelemetry-ext-boto/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-boto/CHANGELOG.md index ec62b405955..a1c2e9465f1 100644 --- a/ext/opentelemetry-ext-boto/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-boto/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-instrumentation-boto + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## Version 0.11b0 Released 2020-07-28 diff --git a/ext/opentelemetry-ext-boto/LICENSE b/instrumentation/opentelemetry-instrumentation-boto/LICENSE similarity index 100% rename from ext/opentelemetry-ext-boto/LICENSE rename to instrumentation/opentelemetry-instrumentation-boto/LICENSE diff --git a/ext/opentelemetry-ext-boto/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-boto/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-boto/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-boto/MANIFEST.in diff --git a/ext/opentelemetry-ext-boto/README.rst b/instrumentation/opentelemetry-instrumentation-boto/README.rst similarity index 53% rename from ext/opentelemetry-ext-boto/README.rst rename to instrumentation/opentelemetry-instrumentation-boto/README.rst index e149ec424e0..2b40321c006 100644 --- a/ext/opentelemetry-ext-boto/README.rst +++ b/instrumentation/opentelemetry-instrumentation-boto/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Boto Tracing |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-boto.svg - :target: https://pypi.org/project/opentelemetry-ext-boto/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-boto.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-boto/ This library allows tracing requests made by the Boto library. @@ -13,11 +13,11 @@ Installation :: - pip install opentelemetry-ext-boto + pip install opentelemetry-instrumentation-boto References ---------- -* `OpenTelemetry Boto Tracing `_ +* `OpenTelemetry Boto Tracing `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg similarity index 86% rename from ext/opentelemetry-ext-boto/setup.cfg rename to instrumentation/opentelemetry-instrumentation-boto/setup.cfg index 1c38775509c..ee47a919cdc 100644 --- a/ext/opentelemetry-ext-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-boto -description = Boto tracing for OpenTelemetry +name = opentelemetry-instrumentation-boto +description = OpenTelemetry Boto instrumentation 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-boto +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-boto platforms = any license = Apache-2.0 classifiers = @@ -43,7 +43,7 @@ install_requires = boto ~= 2.0 opentelemetry-api == 0.12.dev0 opentelemetry-instrumentation == 0.12.dev0 - opentelemetry-ext-botocore == 0.12.dev0 + opentelemetry-instrumentation-botocore == 0.12.dev0 [options.extras_require] test = @@ -56,4 +56,4 @@ where = src [options.entry_points] opentelemetry_instrumentor = - django = opentelemetry.ext.boto:BotoInstrumentor + django = opentelemetry.instrumentation.boto:BotoInstrumentor diff --git a/ext/opentelemetry-ext-opentracing-shim/setup.py b/instrumentation/opentelemetry-instrumentation-boto/setup.py similarity index 92% rename from ext/opentelemetry-ext-opentracing-shim/setup.py rename to instrumentation/opentelemetry-instrumentation-boto/setup.py index 5924121c431..2bd68894f33 100644 --- a/ext/opentelemetry-ext-opentracing-shim/setup.py +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "opentracing_shim", "version.py" + BASE_DIR, "src", "opentelemetry", "instrumentation", "boto", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/__init__.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py similarity index 96% rename from ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/__init__.py rename to instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py index f1f04723afa..e6a0e351e5c 100644 --- a/ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py @@ -27,7 +27,7 @@ .. code:: python from opentelemetry import trace - from opentelemetry.ext.boto import BotoInstrumentor + from opentelemetry.instrumentation.boto import BotoInstrumentor from opentelemetry.sdk.trace import TracerProvider import boto @@ -50,8 +50,8 @@ from boto.connection import AWSAuthConnection, AWSQueryConnection from wrapt import wrap_function_wrapper -from opentelemetry.ext.boto.version import __version__ -from opentelemetry.ext.botocore import add_span_arg_tags, unwrap +from opentelemetry.instrumentation.boto.version import __version__ +from opentelemetry.instrumentation.botocore import add_span_arg_tags, unwrap from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.sdk.trace import Resource from opentelemetry.trace import SpanKind, get_tracer diff --git a/ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/version.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py similarity index 100% rename from ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/version.py rename to instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py diff --git a/ext/opentelemetry-ext-boto/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-boto/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-boto/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-boto/tests/__init__.py diff --git a/ext/opentelemetry-ext-boto/tests/conftest.py b/instrumentation/opentelemetry-instrumentation-boto/tests/conftest.py similarity index 100% rename from ext/opentelemetry-ext-boto/tests/conftest.py rename to instrumentation/opentelemetry-instrumentation-boto/tests/conftest.py diff --git a/ext/opentelemetry-ext-boto/tests/test_boto_instrumentation.py b/instrumentation/opentelemetry-instrumentation-boto/tests/test_boto_instrumentation.py similarity index 99% rename from ext/opentelemetry-ext-boto/tests/test_boto_instrumentation.py rename to instrumentation/opentelemetry-instrumentation-boto/tests/test_boto_instrumentation.py index 7cfbf018c6b..7ed87755018 100644 --- a/ext/opentelemetry-ext-boto/tests/test_boto_instrumentation.py +++ b/instrumentation/opentelemetry-instrumentation-boto/tests/test_boto_instrumentation.py @@ -26,7 +26,7 @@ mock_sts_deprecated, ) -from opentelemetry.ext.boto import BotoInstrumentor +from opentelemetry.instrumentation.boto import BotoInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.test.test_base import TestBase diff --git a/ext/opentelemetry-ext-botocore/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-botocore/CHANGELOG.md similarity index 64% rename from ext/opentelemetry-ext-botocore/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-botocore/CHANGELOG.md index ac8d9c4a514..e89b3fddd2f 100644 --- a/ext/opentelemetry-ext-botocore/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-botocore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-instrumentation-botocore + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## Version 0.11b0 Released 2020-07-28 diff --git a/ext/opentelemetry-ext-botocore/LICENSE b/instrumentation/opentelemetry-instrumentation-botocore/LICENSE similarity index 100% rename from ext/opentelemetry-ext-botocore/LICENSE rename to instrumentation/opentelemetry-instrumentation-botocore/LICENSE diff --git a/ext/opentelemetry-ext-botocore/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-botocore/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-botocore/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-botocore/MANIFEST.in diff --git a/ext/opentelemetry-ext-botocore/README.rst b/instrumentation/opentelemetry-instrumentation-botocore/README.rst similarity index 52% rename from ext/opentelemetry-ext-botocore/README.rst rename to instrumentation/opentelemetry-instrumentation-botocore/README.rst index 0b50819d328..4f5eb9d9aff 100644 --- a/ext/opentelemetry-ext-botocore/README.rst +++ b/instrumentation/opentelemetry-instrumentation-botocore/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Botocore Tracing |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-botocore.svg - :target: https://pypi.org/project/opentelemetry-ext-botocore/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-botocore.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-botocore/ This library allows tracing requests made by the Botocore library. @@ -13,11 +13,11 @@ Installation :: - pip install opentelemetry-ext-botocore + pip install opentelemetry-instrumentation-botocore References ---------- -* `OpenTelemetry Botocore Tracing `_ +* `OpenTelemetry Botocore Tracing `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg similarity index 87% rename from ext/opentelemetry-ext-botocore/setup.cfg rename to instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index 0d8b9e4ad4a..86f3e8d0a41 100644 --- a/ext/opentelemetry-ext-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-botocore -description = Botocore tracing for OpenTelemetry +name = opentelemetry-instrumentation-botocore +description = OpenTelemetry Botocore instrumentation 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-botocore +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-botocore platforms = any license = Apache-2.0 classifiers = @@ -54,4 +54,4 @@ where = src [options.entry_points] opentelemetry_instrumentor = - django = opentelemetry.ext.botocore:BotoCoreInstrumentor + django = opentelemetry.instrumentation.botocore:BotoCoreInstrumentor diff --git a/ext/opentelemetry-ext-botocore/setup.py b/instrumentation/opentelemetry-instrumentation-botocore/setup.py similarity index 88% rename from ext/opentelemetry-ext-botocore/setup.py rename to instrumentation/opentelemetry-instrumentation-botocore/setup.py index 35b47b1b00b..fd5045efaa6 100644 --- a/ext/opentelemetry-ext-botocore/setup.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.py @@ -17,7 +17,12 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "botocore", "version.py" + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "botocore", + "version.py", ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/__init__.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py similarity index 97% rename from ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/__init__.py rename to instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py index 70e790d9bf6..9b9b1e9a806 100644 --- a/ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/__init__.py @@ -28,7 +28,7 @@ .. code:: python from opentelemetry import trace - from opentelemetry.ext.botocore import BotocoreInstrumentor + from opentelemetry.instrumentation.botocore import BotocoreInstrumentor from opentelemetry.sdk.trace import TracerProvider import botocore @@ -56,7 +56,7 @@ from botocore.client import BaseClient from wrapt import ObjectProxy, wrap_function_wrapper -from opentelemetry.ext.botocore.version import __version__ +from opentelemetry.instrumentation.botocore.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.sdk.trace import Resource from opentelemetry.trace import SpanKind, get_tracer diff --git a/ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/version.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py similarity index 100% rename from ext/opentelemetry-ext-botocore/src/opentelemetry/ext/botocore/version.py rename to instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py diff --git a/ext/opentelemetry-ext-botocore/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-botocore/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-botocore/tests/__init__.py diff --git a/ext/opentelemetry-ext-botocore/tests/test_botocore_instrumentation.py b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py similarity index 99% rename from ext/opentelemetry-ext-botocore/tests/test_botocore_instrumentation.py rename to instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py index e0b687ad8b6..47073478fce 100644 --- a/ext/opentelemetry-ext-botocore/tests/test_botocore_instrumentation.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_instrumentation.py @@ -9,7 +9,7 @@ mock_sqs, ) -from opentelemetry.ext.botocore import BotocoreInstrumentor +from opentelemetry.instrumentation.botocore import BotocoreInstrumentor from opentelemetry.sdk.resources import Resource from opentelemetry.test.test_base import TestBase diff --git a/ext/opentelemetry-ext-celery/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-celery/CHANGELOG.md similarity index 55% rename from ext/opentelemetry-ext-celery/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-celery/CHANGELOG.md index 54990c1955c..0de1991b968 100644 --- a/ext/opentelemetry-ext-celery/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-celery/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-instrumentation-celery + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## Version 0.10b0 Released 2020-06-23 diff --git a/ext/opentelemetry-ext-celery/LICENSE b/instrumentation/opentelemetry-instrumentation-celery/LICENSE similarity index 100% rename from ext/opentelemetry-ext-celery/LICENSE rename to instrumentation/opentelemetry-instrumentation-celery/LICENSE diff --git a/ext/opentelemetry-ext-celery/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-celery/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-celery/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-celery/MANIFEST.in diff --git a/ext/opentelemetry-ext-celery/README.rst b/instrumentation/opentelemetry-instrumentation-celery/README.rst similarity index 70% rename from ext/opentelemetry-ext-celery/README.rst rename to instrumentation/opentelemetry-instrumentation-celery/README.rst index feabf6809fc..42fe6646d1c 100644 --- a/ext/opentelemetry-ext-celery/README.rst +++ b/instrumentation/opentelemetry-instrumentation-celery/README.rst @@ -3,8 +3,8 @@ OpenTelemetry Celery Instrumentation |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-celery.svg - :target: https://pypi.org/project/opentelemetry-ext-celery/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-celery.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-celery/ Instrumentation for Celery. @@ -14,7 +14,7 @@ Installation :: - pip install opentelemetry-ext-celery + pip install opentelemetry-instrumentation-celery Usage ----- @@ -29,7 +29,7 @@ Usage .. code-block:: python - from opentelemetry.ext.celery import CeleryInstrumentor + from opentelemetry.instrumentation.celery import CeleryInstrumentor CeleryInstrumentor().instrument() diff --git a/ext/opentelemetry-ext-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg similarity index 90% rename from ext/opentelemetry-ext-celery/setup.cfg rename to instrumentation/opentelemetry-instrumentation-celery/setup.cfg index 39e019e83a9..4198f15569c 100644 --- a/ext/opentelemetry-ext-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-celery +name = opentelemetry-instrumentation-celery description = OpenTelemetry Celery Instrumentation 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-celery +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-celery platforms = any license = Apache-2.0 classifiers = @@ -53,4 +53,4 @@ where = src [options.entry_points] opentelemetry_instrumentor = - celery = opentelemetry.ext.celery:CeleryInstrumentor + celery = opentelemetry.instrumentation.celery:CeleryInstrumentor diff --git a/ext/opentelemetry-ext-elasticsearch/setup.py b/instrumentation/opentelemetry-instrumentation-celery/setup.py similarity index 91% rename from ext/opentelemetry-ext-elasticsearch/setup.py rename to instrumentation/opentelemetry-instrumentation-celery/setup.py index af750c941f4..ca679306607 100644 --- a/ext/opentelemetry-ext-elasticsearch/setup.py +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "elasticsearch", "version.py" + BASE_DIR, "src", "opentelemetry", "instrumentation", "celery", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py similarity index 97% rename from ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py rename to instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py index 9ce31f34f65..7e2551142e4 100644 --- a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/__init__.py @@ -30,7 +30,7 @@ .. code:: python - from opentelemetry.ext.celery import CeleryInstrumentor + from opentelemetry.instrumentation.celery import CeleryInstrumentor CeleryInstrumentor().instrument() @@ -54,8 +54,8 @@ def add(x, y): from celery import signals # pylint: disable=no-name-in-module from opentelemetry import trace -from opentelemetry.ext.celery import utils -from opentelemetry.ext.celery.version import __version__ +from opentelemetry.instrumentation.celery import utils +from opentelemetry.instrumentation.celery.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.trace.status import Status, StatusCanonicalCode diff --git a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/utils.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py similarity index 100% rename from ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/utils.py rename to instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py diff --git a/ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/version.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py similarity index 100% rename from ext/opentelemetry-ext-celery/src/opentelemetry/ext/celery/version.py rename to instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py diff --git a/ext/opentelemetry-ext-celery/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-celery/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-celery/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-celery/tests/__init__.py diff --git a/ext/opentelemetry-ext-celery/tests/test_utils.py b/instrumentation/opentelemetry-instrumentation-celery/tests/test_utils.py similarity index 99% rename from ext/opentelemetry-ext-celery/tests/test_utils.py rename to instrumentation/opentelemetry-instrumentation-celery/tests/test_utils.py index b5e8163def9..0842890e89e 100644 --- a/ext/opentelemetry-ext-celery/tests/test_utils.py +++ b/instrumentation/opentelemetry-instrumentation-celery/tests/test_utils.py @@ -18,7 +18,7 @@ from celery import Celery from opentelemetry import trace as trace_api -from opentelemetry.ext.celery import utils +from opentelemetry.instrumentation.celery import utils from opentelemetry.sdk import trace diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md index c0a38d855f0..555b227db39 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-dbapi/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-dbapi - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.7b1 diff --git a/ext/opentelemetry-ext-elasticsearch/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-elasticsearch/CHANGELOG.md similarity index 62% rename from ext/opentelemetry-ext-elasticsearch/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-elasticsearch/CHANGELOG.md index ede33c6646e..5579a36a625 100644 --- a/ext/opentelemetry-ext-elasticsearch/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/CHANGELOG.md @@ -3,6 +3,8 @@ ## Unreleased - Update environment variable names, prefix changed from `OPENTELEMETRY` to `OTEL` ([#904](https://github.com/open-telemetry/opentelemetry-python/pull/904)) +- Change package name to opentelemetry-instrumentation-elasticsearch + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) ## Version 0.10b0 diff --git a/ext/opentelemetry-ext-elasticsearch/LICENSE b/instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/LICENSE rename to instrumentation/opentelemetry-instrumentation-elasticsearch/LICENSE diff --git a/ext/opentelemetry-ext-elasticsearch/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-elasticsearch/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-elasticsearch/MANIFEST.in diff --git a/ext/opentelemetry-ext-elasticsearch/README.rst b/instrumentation/opentelemetry-instrumentation-elasticsearch/README.rst similarity index 55% rename from ext/opentelemetry-ext-elasticsearch/README.rst rename to instrumentation/opentelemetry-instrumentation-elasticsearch/README.rst index 88e9bb41af3..9f898e78358 100644 --- a/ext/opentelemetry-ext-elasticsearch/README.rst +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/README.rst @@ -3,8 +3,8 @@ OpenTelemetry elasticsearch Integration |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-elasticsearch.svg - :target: https://pypi.org/project/opentelemetry-ext-elasticsearch/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-elasticsearch.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-elasticsearch/ This library allows tracing elasticsearch made by the `elasticsearch `_ library. @@ -14,10 +14,10 @@ Installation :: - pip install opentelemetry-ext-elasticsearch + pip install opentelemetry-instrumentation-elasticsearch References ---------- -* `OpenTelemetry elasticsearch Integration `_ +* `OpenTelemetry elasticsearch Integration `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg similarity index 86% rename from ext/opentelemetry-ext-elasticsearch/setup.cfg rename to instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index 877f62872c5..fc5f862a2c2 100644 --- a/ext/opentelemetry-ext-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-elasticsearch -description = OpenTelemetry elasticsearch integration +name = opentelemetry-instrumentation-elasticsearch +description = OpenTelemetry elasticsearch instrumentation 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-elasticsearch +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-elasticsearch platforms = any license = Apache-2.0 classifiers = @@ -55,4 +55,4 @@ where = src [options.entry_points] opentelemetry_instrumentor = - elasticsearch = opentelemetry.ext.elasticsearch:ElasticsearchInstrumentor + elasticsearch = opentelemetry.instrumentation.elasticsearch:ElasticsearchInstrumentor diff --git a/ext/opentelemetry-ext-celery/setup.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py similarity index 88% rename from ext/opentelemetry-ext-celery/setup.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py index 40d1d7aaba9..cd7a7f10129 100644 --- a/ext/opentelemetry-ext-celery/setup.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py @@ -17,7 +17,12 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "celery", "version.py" + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "elasticsearch", + "version.py", ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py similarity index 97% rename from ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/__init__.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py index 6746d1ac70a..f350a7dc280 100644 --- a/ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py @@ -22,7 +22,7 @@ .. code-block:: python from opentelemetry import trace - from opentelemetry.ext.elasticsearch import ElasticSearchInstrumentor + from opentelemetry.instrumentation.elasticsearch import ElasticSearchInstrumentor from opentelemetry.sdk.trace import TracerProvider import elasticsearch @@ -60,7 +60,7 @@ from wrapt import wrap_function_wrapper as _wrap from opentelemetry import context, propagators, trace -from opentelemetry.ext.elasticsearch.version import __version__ +from opentelemetry.instrumentation.elasticsearch.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.utils import unwrap from opentelemetry.trace import SpanKind, get_tracer diff --git a/ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/version.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/src/opentelemetry/ext/elasticsearch/version.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/__init__.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/helpers_es2.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es2.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/tests/helpers_es2.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es2.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/helpers_es5.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es5.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/tests/helpers_es5.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es5.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/helpers_es6.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es6.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/tests/helpers_es6.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es6.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/helpers_es7.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es7.py similarity index 100% rename from ext/opentelemetry-ext-elasticsearch/tests/helpers_es7.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/helpers_es7.py diff --git a/ext/opentelemetry-ext-elasticsearch/tests/test_elasticsearch.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py similarity index 97% rename from ext/opentelemetry-ext-elasticsearch/tests/test_elasticsearch.py rename to instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py index 3c4fe7f70f0..cc1d3147742 100644 --- a/ext/opentelemetry-ext-elasticsearch/tests/test_elasticsearch.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py @@ -22,8 +22,10 @@ from elasticsearch import Elasticsearch from elasticsearch_dsl import Search -import opentelemetry.ext.elasticsearch -from opentelemetry.ext.elasticsearch import ElasticsearchInstrumentor +import opentelemetry.instrumentation.elasticsearch +from opentelemetry.instrumentation.elasticsearch import ( + ElasticsearchInstrumentor, +) from opentelemetry.test.test_base import TestBase from opentelemetry.trace.status import StatusCanonicalCode @@ -73,9 +75,9 @@ def test_instrumentor(self, request_mock): span = spans_list[0] # Check version and name in span's instrumentation info - # self.check_span_instrumentation_info(span, opentelemetry.ext.elasticsearch) + # self.check_span_instrumentation_info(span, opentelemetry.instrumentation.elasticsearch) self.check_span_instrumentation_info( - span, opentelemetry.ext.elasticsearch + span, opentelemetry.instrumentation.elasticsearch ) # check that no spans are generated after uninstrument diff --git a/ext/opentelemetry-ext-grpc/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-grpc/CHANGELOG.md similarity index 83% rename from ext/opentelemetry-ext-grpc/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-grpc/CHANGELOG.md index 5f272a80f8a..b6b28ecd9f0 100644 --- a/ext/opentelemetry-ext-grpc/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-grpc/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-instrumentation-grpc + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## Version 0.11b0 Released 2020-07-28 diff --git a/ext/opentelemetry-ext-grpc/LICENSE b/instrumentation/opentelemetry-instrumentation-grpc/LICENSE similarity index 100% rename from ext/opentelemetry-ext-grpc/LICENSE rename to instrumentation/opentelemetry-instrumentation-grpc/LICENSE diff --git a/ext/opentelemetry-ext-grpc/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-grpc/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-grpc/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-grpc/MANIFEST.in diff --git a/ext/opentelemetry-ext-grpc/README.rst b/instrumentation/opentelemetry-instrumentation-grpc/README.rst similarity index 51% rename from ext/opentelemetry-ext-grpc/README.rst rename to instrumentation/opentelemetry-instrumentation-grpc/README.rst index 335c03614b9..176bdf1a39b 100644 --- a/ext/opentelemetry-ext-grpc/README.rst +++ b/instrumentation/opentelemetry-instrumentation-grpc/README.rst @@ -3,8 +3,8 @@ OpenTelemetry gRPC Integration |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-grpc.svg - :target: https://pypi.org/project/opentelemetry-ext-grpc/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-grpc.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-grpc/ Client and server interceptors for `gRPC Python`_. @@ -15,4 +15,4 @@ Installation :: - pip install opentelemetry-ext-grpc + pip install opentelemetry-instrumentation-grpc diff --git a/ext/opentelemetry-ext-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg similarity index 87% rename from ext/opentelemetry-ext-grpc/setup.cfg rename to instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index a3533bdf590..0308a229f8f 100644 --- a/ext/opentelemetry-ext-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. [metadata] -name = opentelemetry-ext-grpc +name = opentelemetry-instrumentation-grpc description = OpenTelemetry gRPC instrumentation 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-grpc +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-grpc platforms = any license = Apache-2.0 classifiers = @@ -55,5 +55,5 @@ where = src [options.entry_points] opentelemetry_instrumentor = - grpc_client = opentelemetry.ext.grpc:GrpcInstrumentorClient - grpc_server = opentelemetry.ext.grpc:GrpcInstrumentorServer + grpc_client = opentelemetry.instrumentation.grpc:GrpcInstrumentorClient + grpc_server = opentelemetry.instrumentation.grpc:GrpcInstrumentorServer diff --git a/ext/opentelemetry-ext-grpc/setup.py b/instrumentation/opentelemetry-instrumentation-grpc/setup.py similarity index 91% rename from ext/opentelemetry-ext-grpc/setup.py rename to instrumentation/opentelemetry-instrumentation-grpc/setup.py index 9a0a4b5d1e3..87c720aea23 100644 --- a/ext/opentelemetry-ext-grpc/setup.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.py @@ -18,7 +18,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "grpc", "version.py" + BASE_DIR, "src", "opentelemetry", "instrumentation", "grpc", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/__init__.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/__init__.py similarity index 93% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/__init__.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/__init__.py index 1a665662818..9b6862eba0d 100644 --- a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/__init__.py @@ -26,7 +26,7 @@ import grpc from opentelemetry import trace - from opentelemetry.ext.grpc import GrpcInstrumentorClient, client_interceptor + from opentelemetry.instrumentation.grpc import GrpcInstrumentorClient, client_interceptor from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, @@ -77,8 +77,8 @@ def run(): import grpc from opentelemetry import trace - from opentelemetry.ext.grpc import GrpcInstrumentorServer, server_interceptor - from opentelemetry.ext.grpc.grpcext import intercept_server + from opentelemetry.instrumentation.grpc import GrpcInstrumentorServer, server_interceptor + from opentelemetry.instrumentation.grpc.grpcext import intercept_server from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ( ConsoleSpanExporter, @@ -124,8 +124,11 @@ def serve(): from wrapt import wrap_function_wrapper as _wrap from opentelemetry import trace -from opentelemetry.ext.grpc.grpcext import intercept_channel, intercept_server -from opentelemetry.ext.grpc.version import __version__ +from opentelemetry.instrumentation.grpc.grpcext import ( + intercept_channel, + intercept_server, +) +from opentelemetry.instrumentation.grpc.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.utils import unwrap diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_client.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_client.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_client.py diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_server.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_server.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_server.py diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_utilities.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_utilities.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/_utilities.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/_utilities.py diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/grpcext/__init__.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/grpcext/__init__.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/grpcext/__init__.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/grpcext/__init__.py diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/grpcext/_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/grpcext/_interceptor.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/grpcext/_interceptor.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/grpcext/_interceptor.py diff --git a/ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/version.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py similarity index 100% rename from ext/opentelemetry-ext-grpc/src/opentelemetry/ext/grpc/version.py rename to instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/__init__.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/__init__.py diff --git a/ext/opentelemetry-ext-grpc/tests/_client.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/_client.py similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/_client.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/_client.py diff --git a/ext/opentelemetry-ext-grpc/tests/_server.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/_server.py similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/_server.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/_server.py diff --git a/ext/opentelemetry-ext-grpc/tests/protobuf/test_server.proto b/instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server.proto similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/protobuf/test_server.proto rename to instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server.proto diff --git a/ext/opentelemetry-ext-grpc/tests/protobuf/test_server_pb2.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server_pb2.py similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/protobuf/test_server_pb2.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server_pb2.py diff --git a/ext/opentelemetry-ext-grpc/tests/protobuf/test_server_pb2_grpc.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server_pb2_grpc.py similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/protobuf/test_server_pb2_grpc.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/protobuf/test_server_pb2_grpc.py diff --git a/ext/opentelemetry-ext-grpc/tests/test_client_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py similarity index 93% rename from ext/opentelemetry-ext-grpc/tests/test_client_interceptor.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py index a668f05ca79..458f32e0472 100644 --- a/ext/opentelemetry-ext-grpc/tests/test_client_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py @@ -14,9 +14,9 @@ import grpc -import opentelemetry.ext.grpc +import opentelemetry.instrumentation.grpc from opentelemetry import trace -from opentelemetry.ext.grpc import GrpcInstrumentorClient +from opentelemetry.instrumentation.grpc import GrpcInstrumentorClient from opentelemetry.sdk.metrics.export.aggregate import ( MinMaxSumCountAggregator, SumAggregator, @@ -107,7 +107,9 @@ def test_unary_unary(self): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) self._verify_success_records(8, 8, "/GRPCTestServer/SimpleMethod") @@ -121,7 +123,9 @@ def test_unary_stream(self): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) self._verify_success_records( 8, 40, "/GRPCTestServer/ServerStreamingMethod" @@ -137,7 +141,9 @@ def test_stream_unary(self): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) self._verify_success_records( 40, 8, "/GRPCTestServer/ClientStreamingMethod" @@ -155,7 +161,9 @@ def test_stream_stream(self): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) self._verify_success_records( 40, 40, "/GRPCTestServer/BidirectionalStreamingMethod" @@ -285,4 +293,6 @@ def test_unary_unary(self): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) diff --git a/ext/opentelemetry-ext-grpc/tests/test_server_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py similarity index 95% rename from ext/opentelemetry-ext-grpc/tests/test_server_interceptor.py rename to instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py index 0ba57a43228..a41da47ae92 100644 --- a/ext/opentelemetry-ext-grpc/tests/test_server_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py @@ -20,10 +20,13 @@ import grpc -import opentelemetry.ext.grpc +import opentelemetry.instrumentation.grpc from opentelemetry import trace -from opentelemetry.ext.grpc import GrpcInstrumentorServer, server_interceptor -from opentelemetry.ext.grpc.grpcext import intercept_server +from opentelemetry.instrumentation.grpc import ( + GrpcInstrumentorServer, + server_interceptor, +) +from opentelemetry.instrumentation.grpc.grpcext import intercept_server from opentelemetry.sdk import trace as trace_sdk from opentelemetry.test.test_base import TestBase @@ -76,7 +79,9 @@ def handler(request, context): span = spans_list[0] self.assertEqual(span.name, "test") self.assertIs(span.kind, trace.SpanKind.SERVER) - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) grpc_server_instrumentor.uninstrument() def test_uninstrument(self): @@ -141,7 +146,9 @@ def handler(request, context): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.check_span_instrumentation_info(span, opentelemetry.ext.grpc) + self.check_span_instrumentation_info( + span, opentelemetry.instrumentation.grpc + ) def test_span_lifetime(self): """Check that the span is active for the duration of the call.""" diff --git a/ext/opentelemetry-ext-jinja2/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-jinja2/CHANGELOG.md similarity index 53% rename from ext/opentelemetry-ext-jinja2/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-jinja2/CHANGELOG.md index ededf47daf9..a503fe367ea 100644 --- a/ext/opentelemetry-ext-jinja2/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-jinja2/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change package name to opentelemetry-instrumentation-jinja2 + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## 0.7b1 Released 2020-05-12 diff --git a/ext/opentelemetry-ext-jinja2/LICENSE b/instrumentation/opentelemetry-instrumentation-jinja2/LICENSE similarity index 100% rename from ext/opentelemetry-ext-jinja2/LICENSE rename to instrumentation/opentelemetry-instrumentation-jinja2/LICENSE diff --git a/ext/opentelemetry-ext-jinja2/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-jinja2/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-jinja2/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-jinja2/MANIFEST.in diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/README.rst b/instrumentation/opentelemetry-instrumentation-jinja2/README.rst new file mode 100644 index 00000000000..c74faeb32e1 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-jinja2/README.rst @@ -0,0 +1,21 @@ +OpenTelemetry jinja2 integration +================================ + +|pypi| + +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-jinja2.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-jinja2/ + +Installation +------------ + +:: + + pip install opentelemetry-instrumentation-jinja2 + + +References +---------- + +* `OpenTelemetry jinja2 integration `_ +* `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg similarity index 87% rename from ext/opentelemetry-ext-jinja2/setup.cfg rename to instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index fc0222a0e44..76b9b879201 100644 --- a/ext/opentelemetry-ext-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-jinja2 -description = OpenTelemetry jinja2 integration +name = opentelemetry-instrumentation-jinja2 +description = OpenTelemetry jinja2 instrumentation 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-jinja2 +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-jinja2 platforms = any license = Apache-2.0 classifiers = @@ -53,4 +53,4 @@ where = src [options.entry_points] opentelemetry_instrumentor = - jinja2 = opentelemetry.ext.jinja2:Jinja2Instrumentor + jinja2 = opentelemetry.instrumentation.jinja2:Jinja2Instrumentor diff --git a/ext/opentelemetry-ext-boto/setup.py b/instrumentation/opentelemetry-instrumentation-jinja2/setup.py similarity index 91% rename from ext/opentelemetry-ext-boto/setup.py rename to instrumentation/opentelemetry-instrumentation-jinja2/setup.py index 4c78e9b35f2..e9d484e1ebc 100644 --- a/ext/opentelemetry-ext-boto/setup.py +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.py @@ -17,7 +17,7 @@ BASE_DIR = os.path.dirname(__file__) VERSION_FILENAME = os.path.join( - BASE_DIR, "src", "opentelemetry", "ext", "boto", "version.py" + BASE_DIR, "src", "opentelemetry", "instrumentation", "jinja2", "version.py" ) PACKAGE_INFO = {} with open(VERSION_FILENAME) as f: diff --git a/ext/opentelemetry-ext-jinja2/src/opentelemetry/ext/jinja2/__init__.py b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py similarity index 96% rename from ext/opentelemetry-ext-jinja2/src/opentelemetry/ext/jinja2/__init__.py rename to instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py index 06be28873b0..8ad883b279b 100644 --- a/ext/opentelemetry-ext-jinja2/src/opentelemetry/ext/jinja2/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/__init__.py @@ -26,7 +26,7 @@ .. code-block:: python from jinja2 import Environment, FileSystemLoader - from opentelemetry.ext.jinja2 import Jinja2Instrumentor + from opentelemetry.instrumentation.jinja2 import Jinja2Instrumentor from opentelemetry import trace from opentelemetry.trace import TracerProvider @@ -48,8 +48,8 @@ from wrapt import ObjectProxy from wrapt import wrap_function_wrapper as _wrap -from opentelemetry.ext.jinja2.version import __version__ from opentelemetry.instrumentation.instrumentor import BaseInstrumentor +from opentelemetry.instrumentation.jinja2.version import __version__ from opentelemetry.instrumentation.utils import unwrap from opentelemetry.trace import SpanKind, get_tracer from opentelemetry.trace.status import Status, StatusCanonicalCode diff --git a/ext/opentelemetry-ext-jinja2/src/opentelemetry/ext/jinja2/version.py b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py similarity index 100% rename from ext/opentelemetry-ext-jinja2/src/opentelemetry/ext/jinja2/version.py rename to instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py diff --git a/ext/opentelemetry-ext-jinja2/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-jinja2/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-jinja2/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-jinja2/tests/__init__.py diff --git a/ext/opentelemetry-ext-jinja2/tests/templates/base.html b/instrumentation/opentelemetry-instrumentation-jinja2/tests/templates/base.html similarity index 100% rename from ext/opentelemetry-ext-jinja2/tests/templates/base.html rename to instrumentation/opentelemetry-instrumentation-jinja2/tests/templates/base.html diff --git a/ext/opentelemetry-ext-jinja2/tests/templates/template.html b/instrumentation/opentelemetry-instrumentation-jinja2/tests/templates/template.html similarity index 100% rename from ext/opentelemetry-ext-jinja2/tests/templates/template.html rename to instrumentation/opentelemetry-instrumentation-jinja2/tests/templates/template.html diff --git a/ext/opentelemetry-ext-jinja2/tests/test_jinja2.py b/instrumentation/opentelemetry-instrumentation-jinja2/tests/test_jinja2.py similarity index 99% rename from ext/opentelemetry-ext-jinja2/tests/test_jinja2.py rename to instrumentation/opentelemetry-instrumentation-jinja2/tests/test_jinja2.py index 6abfa9a836c..7f5b52c936d 100644 --- a/ext/opentelemetry-ext-jinja2/tests/test_jinja2.py +++ b/instrumentation/opentelemetry-instrumentation-jinja2/tests/test_jinja2.py @@ -17,7 +17,7 @@ import jinja2 from opentelemetry import trace as trace_api -from opentelemetry.ext.jinja2 import Jinja2Instrumentor +from opentelemetry.instrumentation.jinja2 import Jinja2Instrumentor from opentelemetry.test.test_base import TestBase from opentelemetry.trace import get_tracer diff --git a/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md index 434a612abc3..944b34d5ad6 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-mysql/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-mysql - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## Version 0.11b0 diff --git a/ext/opentelemetry-ext-opentracing-shim/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-opentracing-shim/CHANGELOG.md similarity index 63% rename from ext/opentelemetry-ext-opentracing-shim/CHANGELOG.md rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/CHANGELOG.md index af8ddc4ae88..47bbc0ada0a 100644 --- a/ext/opentelemetry-ext-opentracing-shim/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Change reference names to opentelemetry-instrumentation-opentracing-shim + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + ## 0.3a0 Released 2019-12-11 diff --git a/ext/opentelemetry-ext-opentracing-shim/LICENSE b/instrumentation/opentelemetry-instrumentation-opentracing-shim/LICENSE similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/LICENSE rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/LICENSE diff --git a/ext/opentelemetry-ext-opentracing-shim/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-opentracing-shim/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/MANIFEST.in diff --git a/ext/opentelemetry-ext-opentracing-shim/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst similarity index 83% rename from ext/opentelemetry-ext-opentracing-shim/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst index 3bba15f167e..7a8413ef59d 100644 --- a/ext/opentelemetry-ext-opentracing-shim/README.rst +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/README.rst @@ -16,5 +16,5 @@ Installation References ---------- -* `OpenTracing Shim for OpenTelemetry `_ +* `OpenTracing Shim for OpenTelemetry `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-opentracing-shim/setup.cfg b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg similarity index 95% rename from ext/opentelemetry-ext-opentracing-shim/setup.cfg rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg index f0878b82b64..1a822d49cee 100644 --- a/ext/opentelemetry-ext-opentracing-shim/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg @@ -19,7 +19,7 @@ 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-opentracing-shim +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-opentracing-shim platforms = any license = Apache-2.0 classifiers = diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py new file mode 100644 index 00000000000..f5d71a86b56 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.py @@ -0,0 +1,31 @@ +# 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 os + +import setuptools + +BASE_DIR = os.path.dirname(__file__) +VERSION_FILENAME = os.path.join( + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "opentracing_shim", + "version.py", +) +PACKAGE_INFO = {} +with open(VERSION_FILENAME) as f: + exec(f.read(), PACKAGE_INFO) + +setuptools.setup(version=PACKAGE_INFO["__version__"]) diff --git a/ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py similarity index 99% rename from ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py index 8d8afca5cab..22c67c53ea2 100644 --- a/ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/__init__.py @@ -30,7 +30,7 @@ from opentelemetry import trace from opentelemetry.sdk.trace import TracerProvider - from opentelemetry.ext.opentracing_shim import create_tracer + from opentelemetry.instrumentation.opentracing_shim import create_tracer # Tell OpenTelemetry which Tracer implementation to use. trace.set_tracer_provider(TracerProvider()) @@ -93,8 +93,8 @@ from opentelemetry import propagators from opentelemetry.context import Context from opentelemetry.correlationcontext import get_correlation, set_correlation -from opentelemetry.ext.opentracing_shim import util -from opentelemetry.ext.opentracing_shim.version import __version__ +from opentelemetry.instrumentation.opentracing_shim import util +from opentelemetry.instrumentation.opentracing_shim.version import __version__ from opentelemetry.trace import ( INVALID_SPAN_CONTEXT, DefaultSpan, diff --git a/ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/util.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/util.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/util.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/util.py diff --git a/ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/version.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/src/opentelemetry/ext/opentracing_shim/version.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py similarity index 98% rename from ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py index 635907bc90b..8b46a4bcb3b 100644 --- a/ext/opentelemetry-ext-opentracing-shim/tests/test_shim.py +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py @@ -22,7 +22,7 @@ import opentracing from opentelemetry import propagators, trace -from opentelemetry.ext.opentracing_shim import ( +from opentelemetry.instrumentation.opentracing_shim import ( SpanContextShim, SpanShim, create_tracer, @@ -137,7 +137,7 @@ def test_explicit_start_time(self): with self.shim.start_active_span("TestSpan", start_time=now) as scope: result = util.time_seconds_from_ns(scope.span.unwrap().start_time) # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(result, now, places=6) @@ -151,7 +151,7 @@ def test_explicit_end_time(self): end_time = util.time_seconds_from_ns(span.unwrap().end_time) # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.instrumentation.opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(end_time, now, places=6) @@ -422,7 +422,7 @@ def test_log_kv(self): ) self.assertEqual(span.unwrap().events[1].attributes["foo"], "bar") # Tolerate inaccuracies of less than a microsecond. See Note: - # https://open-telemetry.github.io/opentelemetry-python/opentelemetry.ext.opentracing_shim.html + # https://open-telemetry.github.io/opentelemetry-python/instrumentation/opentracing_shim/opentracing_shim.html # TODO: This seems to work consistently, but we should find out the # biggest possible loss of precision. self.assertAlmostEqual(result, now, places=6) diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/test_util.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py similarity index 97% rename from ext/opentelemetry-ext-opentracing-shim/tests/test_util.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py index cbbd4b075aa..806a8da609b 100644 --- a/ext/opentelemetry-ext-opentracing-shim/tests/test_util.py +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_util.py @@ -15,7 +15,7 @@ import time import unittest -from opentelemetry.ext.opentracing_shim import util +from opentelemetry.instrumentation.opentracing_shim import util from opentelemetry.util import time_ns diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py similarity index 92% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py index b3b4271f022..c12bbfa0291 100644 --- a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/otel_ot_shim_tracer.py @@ -1,4 +1,4 @@ -import opentelemetry.ext.opentracing_shim as opentracingshim +import opentelemetry.instrumentation.opentracing_shim as opentracingshim from opentelemetry.sdk import trace from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_active_span_replacement/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_client_server/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_client_server/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/request_handler.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_common_request_handler/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_late_span_finish/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/response_listener.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_listener_per_request/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_nested_callbacks/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/README.rst diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/__init__.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_asyncio.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/test_subtask_span_propagation/test_threads.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/testcase.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/testcase.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/testcase.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/testcase.py diff --git a/ext/opentelemetry-ext-opentracing-shim/tests/testbed/utils.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/utils.py similarity index 100% rename from ext/opentelemetry-ext-opentracing-shim/tests/testbed/utils.py rename to instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/utils.py diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md index c997f239456..e5f81a558b7 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-psycopg2 - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.8b0 diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md index c549095d2ee..a01e0e2c536 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-pymemcache - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## Version 0.10b0 diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md index 59f8e35551c..a92d2b53da4 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-pymongo/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-pymongo - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.7b1 diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md index f9b59fcf7a2..9fea902d187 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-pymysql/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-pymysql - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.7b1 diff --git a/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md index 79c4e6bf923..bac3153a811 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-redis/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-redis - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.7b1 diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md index 3022345ac72..f46080a9b99 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-sqlalchemy - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.7b1 diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md index 7804da90517..12d001bdf1c 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/CHANGELOG.md @@ -3,7 +3,7 @@ ## Unreleased - Change package name to opentelemetry-instrumentation-sqlite3 - ([#999](https://github.com/open-telemetry/opentelemetry-python/pull/999)) + ([#966](https://github.com/open-telemetry/opentelemetry-python/pull/966)) ## 0.8b0 diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-system-metrics/CHANGELOG.md new file mode 100644 index 00000000000..f752d8314d7 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/CHANGELOG.md @@ -0,0 +1,12 @@ +# Changelog + +## Unreleased + +- Change package name to opentelemetry-instrumentation-system-metrics + ([#969](https://github.com/open-telemetry/opentelemetry-python/pull/969)) + +## 0.9b0 + +Released 2020-06-10 + +- Initial release (https://github.com/open-telemetry/opentelemetry-python/pull/652) diff --git a/ext/opentelemetry-ext-system-metrics/LICENSE b/instrumentation/opentelemetry-instrumentation-system-metrics/LICENSE similarity index 100% rename from ext/opentelemetry-ext-system-metrics/LICENSE rename to instrumentation/opentelemetry-instrumentation-system-metrics/LICENSE diff --git a/ext/opentelemetry-ext-system-metrics/MANIFEST.in b/instrumentation/opentelemetry-instrumentation-system-metrics/MANIFEST.in similarity index 100% rename from ext/opentelemetry-ext-system-metrics/MANIFEST.in rename to instrumentation/opentelemetry-instrumentation-system-metrics/MANIFEST.in diff --git a/ext/opentelemetry-ext-system-metrics/README.rst b/instrumentation/opentelemetry-instrumentation-system-metrics/README.rst similarity index 50% rename from ext/opentelemetry-ext-system-metrics/README.rst rename to instrumentation/opentelemetry-instrumentation-system-metrics/README.rst index 796f3f13f26..fc984256bf6 100644 --- a/ext/opentelemetry-ext-system-metrics/README.rst +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/README.rst @@ -3,8 +3,8 @@ OpenTelemetry System Metrics Instrumentation |pypi| -.. |pypi| image:: https://badge.fury.io/py/opentelemetry-ext-system-metrics.svg - :target: https://pypi.org/project/opentelemetry-ext-system-metrics/ +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-system-metrics.svg + :target: https://pypi.org/project/opentelemetry-instrumentation-system-metrics/ Instrumentation to collect system performance metrics. @@ -14,11 +14,11 @@ Installation :: - pip install opentelemetry-ext-system-metrics + pip install opentelemetry-instrumentation-system-metrics References ---------- -* `OpenTelemetry System Metrics Instrumentation `_ +* `OpenTelemetry System Metrics Instrumentation `_ * `OpenTelemetry Project `_ diff --git a/ext/opentelemetry-ext-system-metrics/setup.cfg b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg similarity index 92% rename from ext/opentelemetry-ext-system-metrics/setup.cfg rename to instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg index 08a1fe8f1c4..4b6f4f07f57 100644 --- a/ext/opentelemetry-ext-system-metrics/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.cfg @@ -13,13 +13,13 @@ # limitations under the License. # [metadata] -name = opentelemetry-ext-system-metrics +name = opentelemetry-instrumentation-system-metrics description = OpenTelemetry System Metrics Instrumentation 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-system-metrics +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/instrumentation/opentelemetry-instrumentation-system-metrics platforms = any license = Apache-2.0 classifiers = diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/setup.py b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.py new file mode 100644 index 00000000000..f0bbf9eff07 --- /dev/null +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/setup.py @@ -0,0 +1,31 @@ +# 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 os + +import setuptools + +BASE_DIR = os.path.dirname(__file__) +VERSION_FILENAME = os.path.join( + BASE_DIR, + "src", + "opentelemetry", + "instrumentation", + "system_metrics", + "version.py", +) +PACKAGE_INFO = {} +with open(VERSION_FILENAME) as f: + exec(f.read(), PACKAGE_INFO) + +setuptools.setup(version=PACKAGE_INFO["__version__"]) diff --git a/ext/opentelemetry-ext-system-metrics/src/opentelemetry/ext/system_metrics/__init__.py b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py similarity index 99% rename from ext/opentelemetry-ext-system-metrics/src/opentelemetry/ext/system_metrics/__init__.py rename to instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py index 10b09795571..fcd96f8210a 100644 --- a/ext/opentelemetry-ext-system-metrics/src/opentelemetry/ext/system_metrics/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py @@ -29,7 +29,7 @@ .. code:: python from opentelemetry import metrics - from opentelemetry.ext.system_metrics import SystemMetrics + from opentelemetry.instrumentation.system_metrics import SystemMetrics from opentelemetry.sdk.metrics import MeterProvider, from opentelemetry.sdk.metrics.export import ConsoleMetricsExporter diff --git a/ext/opentelemetry-ext-system-metrics/src/opentelemetry/ext/system_metrics/version.py b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py similarity index 100% rename from ext/opentelemetry-ext-system-metrics/src/opentelemetry/ext/system_metrics/version.py rename to instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/version.py diff --git a/ext/opentelemetry-ext-system-metrics/tests/__init__.py b/instrumentation/opentelemetry-instrumentation-system-metrics/tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-system-metrics/tests/__init__.py rename to instrumentation/opentelemetry-instrumentation-system-metrics/tests/__init__.py diff --git a/ext/opentelemetry-ext-system-metrics/tests/test_system_metrics.py b/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py similarity index 99% rename from ext/opentelemetry-ext-system-metrics/tests/test_system_metrics.py rename to instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py index b2d6bab4015..b9ae662af19 100644 --- a/ext/opentelemetry-ext-system-metrics/tests/test_system_metrics.py +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py @@ -16,7 +16,7 @@ from unittest import mock from opentelemetry import metrics -from opentelemetry.ext.system_metrics import SystemMetrics +from opentelemetry.instrumentation.system_metrics import SystemMetrics from opentelemetry.test.test_base import TestBase diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py index 7b512a84ce7..125032b95da 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py @@ -27,16 +27,16 @@ instrumentations = { "asgi": "opentelemetry-instrumentation-asgi>=0.11b0", "asyncpg": "opentelemetry-instrumentation-asyncpg>=0.11b0", - "boto": "opentelemetry-ext-boto>=0.11b0", - "botocore": "opentelemetry-ext-botocore>=0.11b0", - "celery": "opentelemetry-ext-celery>=0.11b0", + "boto": "opentelemetry-instrumentation-boto>=0.11b0", + "botocore": "opentelemetry-instrumentation-botocore>=0.11b0", + "celery": "opentelemetry-instrumentation-celery>=0.11b0", "dbapi": "opentelemetry-instrumentation-dbapi>=0.8b0", "django": "opentelemetry-instrumentation-django>=0.8b0", - "elasticsearch": "opentelemetry-ext-elasticsearch>=0.11b0", + "elasticsearch": "opentelemetry-instrumentation-elasticsearch>=0.11b0", "fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0", "flask": "opentelemetry-instrumentation-flask>=0.8b0", - "grpc": "opentelemetry-ext-grpc>=0.8b0", - "jinja2": "opentelemetry-ext-jinja2>=0.8b0", + "grpc": "opentelemetry-instrumentation-grpc>=0.8b0", + "jinja2": "opentelemetry-instrumentation-jinja2>=0.8b0", "mysql": "opentelemetry-instrumentation-mysql>=0.8b0", "psycopg2": "opentelemetry-instrumentation-psycopg2>=0.8b0", "pymemcache": "opentelemetry-instrumentation-pymemcache>=0.11b0", @@ -55,16 +55,16 @@ libraries = { "asgi": ("opentelemetry-instrumentation-asgi",), "asyncpg": ("opentelemetry-instrumentation-asyncpg",), - "boto": ("opentelemetry-ext-boto",), - "botocore": ("opentelemetry-ext-botocore",), - "celery": ("opentelemetry-ext-celery",), + "boto": ("opentelemetry-instrumentation-boto",), + "botocore": ("opentelemetry-instrumentation-botocore",), + "celery": ("opentelemetry-instrumentation-celery",), "dbapi": ("opentelemetry-instrumentation-dbapi",), "django": ("opentelemetry-instrumentation-django",), - "elasticsearch": ("opentelemetry-ext-elasticsearch",), + "elasticsearch": ("opentelemetry-instrumentation-elasticsearch",), "fastapi": ("opentelemetry-instrumentation-fastapi",), "flask": ("opentelemetry-instrumentation-flask",), - "grpc": ("opentelemetry-ext-grpc",), - "jinja2": ("opentelemetry-ext-jinja2",), + "grpc": ("opentelemetry-instrumentation-grpc",), + "jinja2": ("opentelemetry-instrumentation-jinja2",), "mysql": ("opentelemetry-instrumentation-mysql",), "psycopg2": ("opentelemetry-instrumentation-psycopg2",), "pymemcache": ("opentelemetry-instrumentation-pymemcache",), diff --git a/scripts/coverage.sh b/scripts/coverage.sh index 830381225f4..7d3daa2af7a 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -7,7 +7,7 @@ function cov { then pytest \ --ignore-glob=*/setup.py \ - --ignore-glob=ext/opentelemetry-ext-opentracing-shim/tests/testbed/* \ + --ignore-glob=instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/testbed/* \ --cov ${1} \ --cov-append \ --cov-branch \ @@ -35,7 +35,7 @@ cov exporter/opentelemetry-exporter-datadog cov instrumentation/opentelemetry-instrumentation-flask cov instrumentation/opentelemetry-instrumentation-requests cov exporter/opentelemetry-exporter-jaeger -cov ext/opentelemetry-ext-opentracing-shim +cov instrumentation/opentelemetry-instrumentation-opentracing-shim cov instrumentation/opentelemetry-instrumentation-wsgi cov exporter/opentelemetry-exporter-zipkin cov docs/examples/opentelemetry-example-app diff --git a/ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py b/tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/asyncpg/test_asyncpg_functional.py rename to tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/celery/conftest.py b/tests/opentelemetry-docker-tests/tests/celery/conftest.py similarity index 97% rename from ext/opentelemetry-ext-docker-tests/tests/celery/conftest.py rename to tests/opentelemetry-docker-tests/tests/celery/conftest.py index 0e6976382e7..085fe3bab1e 100644 --- a/ext/opentelemetry-ext-docker-tests/tests/celery/conftest.py +++ b/tests/opentelemetry-docker-tests/tests/celery/conftest.py @@ -18,7 +18,7 @@ import pytest from opentelemetry import trace as trace_api -from opentelemetry.ext.celery import CeleryInstrumentor +from opentelemetry.instrumentation.celery import CeleryInstrumentor from opentelemetry.sdk.trace import TracerProvider, export from opentelemetry.sdk.trace.export.in_memory_span_exporter import ( InMemorySpanExporter, diff --git a/ext/opentelemetry-ext-docker-tests/tests/celery/test_celery_functional.py b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py similarity index 97% rename from ext/opentelemetry-ext-docker-tests/tests/celery/test_celery_functional.py rename to tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py index a3967a5612a..2714c8ee033 100644 --- a/ext/opentelemetry-ext-docker-tests/tests/celery/test_celery_functional.py +++ b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py @@ -20,9 +20,9 @@ from celery import signals from celery.exceptions import Retry -import opentelemetry.ext.celery +import opentelemetry.instrumentation.celery from opentelemetry import trace as trace_api -from opentelemetry.ext.celery import CeleryInstrumentor +from opentelemetry.instrumentation.celery import CeleryInstrumentor from opentelemetry.sdk import resources from opentelemetry.sdk.trace import TracerProvider, export from opentelemetry.trace.status import StatusCanonicalCode @@ -51,18 +51,19 @@ def fn_task(): assert ( async_span.instrumentation_info.name - == opentelemetry.ext.celery.__name__ + == opentelemetry.instrumentation.celery.__name__ ) assert ( async_span.instrumentation_info.version - == opentelemetry.ext.celery.__version__ + == opentelemetry.instrumentation.celery.__version__ ) assert ( - run_span.instrumentation_info.name == opentelemetry.ext.celery.__name__ + run_span.instrumentation_info.name + == opentelemetry.instrumentation.celery.__name__ ) assert ( run_span.instrumentation_info.version - == opentelemetry.ext.celery.__version__ + == opentelemetry.instrumentation.celery.__version__ ) diff --git a/ext/opentelemetry-ext-docker-tests/tests/check_availability.py b/tests/opentelemetry-docker-tests/tests/check_availability.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/check_availability.py rename to tests/opentelemetry-docker-tests/tests/check_availability.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/docker-compose.yml b/tests/opentelemetry-docker-tests/tests/docker-compose.yml similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/docker-compose.yml rename to tests/opentelemetry-docker-tests/tests/docker-compose.yml diff --git a/ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py b/tests/opentelemetry-docker-tests/tests/mysql/test_mysql_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/mysql/test_mysql_functional.py rename to tests/opentelemetry-docker-tests/tests/mysql/test_mysql_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py b/tests/opentelemetry-docker-tests/tests/opencensus/test_opencensusexporter_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/opencensus/test_opencensusexporter_functional.py rename to tests/opentelemetry-docker-tests/tests/opencensus/test_opencensusexporter_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/postgres/test_aiopg_functional.py b/tests/opentelemetry-docker-tests/tests/postgres/test_aiopg_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/postgres/test_aiopg_functional.py rename to tests/opentelemetry-docker-tests/tests/postgres/test_aiopg_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py b/tests/opentelemetry-docker-tests/tests/postgres/test_psycopg_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/postgres/test_psycopg_functional.py rename to tests/opentelemetry-docker-tests/tests/postgres/test_psycopg_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py b/tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/pymongo/test_pymongo_functional.py rename to tests/opentelemetry-docker-tests/tests/pymongo/test_pymongo_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py b/tests/opentelemetry-docker-tests/tests/pymysql/test_pymysql_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/pymysql/test_pymysql_functional.py rename to tests/opentelemetry-docker-tests/tests/pymysql/test_pymysql_functional.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py b/tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/redis/test_redis_functional.py rename to tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py diff --git a/ext/opentelemetry-ext-grpc/tests/__init__.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/__init__.py similarity index 100% rename from ext/opentelemetry-ext-grpc/tests/__init__.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/__init__.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/mixins.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_instrument.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_mysql.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_postgres.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py diff --git a/ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py similarity index 100% rename from ext/opentelemetry-ext-docker-tests/tests/sqlalchemy_tests/test_sqlite.py rename to tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py diff --git a/tox.ini b/tox.ini index 8528b63f600..91024f7f3d4 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,7 @@ envlist = py3{5,6,7,8}-test-instrumentation-aiopg ; instrumentation-aiopg intentionally excluded from pypy3 - ; opentelemetry-ext-botocore + ; opentelemetry-instrumentation-botocore py3{6,7,8}-test-instrumentation-botocore pypy3-test-instrumentation-botocore @@ -48,7 +48,7 @@ envlist = py3{4,5,6,7,8}-test-instrumentation-dbapi pypy3-test-instrumentation-dbapi - ; opentelemetry-ext-boto + ; opentelemetry-instrumentation-boto py3{5,6,7,8}-test-instrumentation-boto pypy3-test-instrumentation-boto @@ -74,7 +74,7 @@ envlist = py3{6,7,8}-test-instrumentation-starlette pypy3-test-instrumentation-starlette - ; opentelemetry-ext-jinja2 + ; opentelemetry-instrumentation-jinja2 py3{4,5,6,7,8}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 @@ -145,7 +145,7 @@ envlist = py3{4,5,6,7,8}-test-core-opentracing-shim pypy3-test-core-opentracing-shim - ; opentelemetry-ext-grpc + ; opentelemetry-instrumentation-grpc py3{5,6,7,8}-test-instrumentation-grpc ; opentelemetry-instrumentation-sqlalchemy @@ -156,13 +156,13 @@ envlist = py3{4,5,6,7,8}-test-instrumentation-redis pypy3-test-instrumentation-redis - ; opentelemetry-ext-celery + ; opentelemetry-instrumentation-celery py3{5,6,7,8}-test-instrumentation-celery pypy3-test-instrumentation-celery - ; opentelemetry-ext-system-metrics + ; opentelemetry-instrumentation-system-metrics py3{4,5,6,7,8}-test-instrumentation-system-metrics - ; ext-system-metrics intentionally excluded from pypy3 + ; instrumentation-system-metrics intentionally excluded from pypy3 ; known limitation: gc.get_count won't work under pypy lint @@ -195,23 +195,23 @@ changedir = test-core-proto: opentelemetry-proto/tests test-core-instrumentation: opentelemetry-instrumentation/tests test-core-getting-started: docs/getting_started/tests - test-core-opentracing-shim: ext/opentelemetry-ext-opentracing-shim/tests + test-core-opentracing-shim: instrumentation/opentelemetry-instrumentation-opentracing-shim/tests test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests test-instrumentation-asgi: instrumentation/opentelemetry-instrumentation-asgi/tests test-instrumentation-asyncpg: instrumentation/opentelemetry-instrumentation-asyncpg/tests - test-instrumentation-boto: ext/opentelemetry-ext-boto/tests - test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests - test-instrumentation-celery: ext/opentelemetry-ext-celery/tests + test-instrumentation-boto: instrumentation/opentelemetry-instrumentation-boto/tests + test-instrumentation-botocore: instrumentation/opentelemetry-instrumentation-botocore/tests + test-instrumentation-celery: instrumentation/opentelemetry-instrumentation-celery/tests test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests test-instrumentation-django: instrumentation/opentelemetry-instrumentation-django/tests test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests - test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests + test-instrumentation-elasticsearch{2,5,6,7}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests test-instrumentation-flask: instrumentation/opentelemetry-instrumentation-flask/tests - test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests - test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests + test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests + test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests test-instrumentation-pymemcache: instrumentation/opentelemetry-instrumentation-pymemcache/tests @@ -223,7 +223,7 @@ changedir = test-instrumentation-sqlalchemy: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests - test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests + test-instrumentation-system-metrics: instrumentation/opentelemetry-instrumentation-system-metrics/tests test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests test-exporter-jaeger: exporter/opentelemetry-exporter-jaeger/tests @@ -241,27 +241,27 @@ commands_pre = test: pip install {toxinidir}/opentelemetry-api {toxinidir}/opentelemetry-sdk {toxinidir}/tests/util test-core-proto: pip install {toxinidir}/opentelemetry-proto - ext,instrumentation: pip install {toxinidir}/opentelemetry-instrumentation + instrumentation: pip install {toxinidir}/opentelemetry-instrumentation example-app: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi {toxinidir}/instrumentation/opentelemetry-instrumentation-flask {toxinidir}/docs/examples/opentelemetry-example-app getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/instrumentation/opentelemetry-instrumentation-requests -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi -e {toxinidir}/instrumentation/opentelemetry-instrumentation-flask - celery: pip install {toxinidir}/ext/opentelemetry-ext-celery[test] + celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test] - grpc: pip install {toxinidir}/ext/opentelemetry-ext-grpc[test] + grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test] wsgi,flask,django,pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi asgi,starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi asyncpg: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg - boto: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test] - boto: pip install {toxinidir}/ext/opentelemetry-ext-boto[test] + boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test] + boto: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test] flask: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-flask[test] - botocore: pip install {toxinidir}/ext/opentelemetry-ext-botocore[test] + botocore: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore[test] dbapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test] @@ -296,7 +296,7 @@ commands_pre = starlette: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette[test] - jinja2: pip install {toxinidir}/ext/opentelemetry-ext-jinja2[test] + jinja2: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2[test] aiohttp-client: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client @@ -305,7 +305,7 @@ commands_pre = 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 + opentracing-shim: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim datadog: pip install {toxinidir}/opentelemetry-sdk {toxinidir}/exporter/opentelemetry-exporter-datadog @@ -313,9 +313,9 @@ commands_pre = sqlalchemy: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy - system-metrics: pip install {toxinidir}/ext/opentelemetry-ext-system-metrics[test] + system-metrics: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics[test] - elasticsearch{2,5,6,7}: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/ext/opentelemetry-ext-elasticsearch[test] + elasticsearch{2,5,6,7}: pip install {toxinidir}/opentelemetry-instrumentation {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test] ; In order to get a healthy coverage report, ; we have to install packages in editable mode. @@ -405,7 +405,7 @@ deps = celery ~= 4.0, != 4.4.4 changedir = - ext/opentelemetry-ext-docker-tests/tests + tests/opentelemetry-docker-tests/tests commands_pre = pip install -e {toxinidir}/opentelemetry-api \ @@ -413,7 +413,7 @@ commands_pre = -e {toxinidir}/opentelemetry-instrumentation \ -e {toxinidir}/tests/util \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg \ - -e {toxinidir}/ext/opentelemetry-ext-celery \ + -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 \ @@ -422,7 +422,7 @@ commands_pre = -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg \ -e {toxinidir}/instrumentation/opentelemetry-instrumentation-redis \ - -e {toxinidir}/ext/opentelemetry-ext-system-metrics \ + -e {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics \ -e {toxinidir}/exporter/opentelemetry-exporter-opencensus docker-compose up -d python check_availability.py