Rename opentelemetry-auto-instrumentation to opentelemetry-instrumentation,and the console command opentelemetry-auto-instrumentation to opentelemetry-instrument

Author: cnnradams

docs/auto_instrumentation/auto_instrumentation.rst

@@ -1,7 +1,7 @@
 OpenTelemetry Python Autoinstrumentation
 ========================================
 
-.. automodule:: opentelemetry.auto_instrumentation
+.. automodule:: opentelemetry.instrumentation
     :members:
     :undoc-members:
     :show-inheritance:

docs/auto_instrumentation/instrumentor.rst

@@ -1,7 +1,7 @@
-opentelemetry.auto_instrumentation.instrumentor package
+opentelemetry.instrumentation.instrumentor package
 =======================================================
 
-.. automodule:: opentelemetry.auto_instrumentation.instrumentor
+.. automodule:: opentelemetry.instrumentation.instrumentor
     :members:
     :undoc-members:
     :show-inheritance:

docs/conf.py

@@ -27,7 +27,7 @@
 source_dirs = [
     os.path.abspath("../opentelemetry-api/src/"),
     os.path.abspath("../opentelemetry-sdk/src/"),
-    os.path.abspath("../opentelemetry-auto-instrumentation/src/"),
+    os.path.abspath("../opentelemetry-instrumentation/src/"),
 ]
 
 ext = "../ext"

docs/examples/auto-instrumentation/README.rst

@@ -72,7 +72,7 @@ Installation
 .. code:: sh
 
     $ pip install opentelemetry-sdk
-    $ pip install opentelemetry-auto-instrumentation
+    $ pip install opentelemetry-instrumentation
     $ pip install opentelemetry-ext-flask
     $ pip install requests
 
@@ -138,7 +138,7 @@ and run this instead:
 
 .. code:: sh
 
-    $ opentelemetry-auto-instrumentation python server_uninstrumented.py
+    $ opentelemetry-instrumentation python server_uninstrumented.py
 
 In the console where you previously executed ``client.py``, run again
 this again:

docs/examples/datadog_exporter/README.rst

@@ -44,7 +44,7 @@ Auto-Instrumention Example
     pip install opentelemetry-api
     pip install opentelemetry-sdk
     pip install opentelemetry-ext-datadog
-    pip install opentelemetry-auto-instrumentation
+    pip install opentelemetry-instrumentation
     pip install opentelemetry-ext-flask
     pip install flask
     pip install requests
@@ -66,16 +66,16 @@ Auto-Instrumention Example
 
 .. code-block:: sh
 
-    opentelemetry-auto-instrumentation python server.py
+    opentelemetry-instrumentation python server.py
 
 * Run client
 
 .. code-block:: sh
 
-    opentelemetry-auto-instrumentation python client.py testing
+    opentelemetry-instrumentation python client.py testing
 
 * Run client with parameter to raise error
 
 .. code-block:: sh
 
-    opentelemetry-auto-instrumentation python client.py error
+    opentelemetry-instrumentation python client.py error

eachdist.ini

@@ -4,7 +4,7 @@
 sortfirst=
     opentelemetry-api
     opentelemetry-sdk
-    opentelemetry-auto-instrumentation
+    opentelemetry-instrumentation
     ext/opentelemetry-ext-wsgi
     ext/opentelemetry-ext-dbapi
     ext/*

ext/opentelemetry-ext-aiohttp-client/setup.cfg

@@ -40,6 +40,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api >= 0.9.dev0
+    opentelemetry-instrumentation == 0.9.dev0
     aiohttp ~= 3.0
 
 [options.packages.find]

ext/opentelemetry-ext-boto/setup.cfg

@@ -42,7 +42,7 @@ packages=find_namespace:
 install_requires =
     boto ~= 2.0
     opentelemetry-api == 0.9.dev0
-    opentelemetry-auto-instrumentation == 0.9.dev0
+    opentelemetry-instrumentation == 0.9.dev0
 
 [options.extras_require]
 test =

ext/opentelemetry-ext-boto/src/opentelemetry/ext/boto/__init__.py

@@ -15,7 +15,7 @@
 Instrument `Boto`_ to trace service requests.
 
 There are two options for instrumenting code. The first option is to use the
-``opentelemetry-auto-instrumentation`` executable which will automatically
+``opentelemetry-instrumentation`` executable which will automatically
 instrument your Boto client. The second is to programmatically enable
 instrumentation via the following code:
 
@@ -50,8 +50,8 @@
 from boto.connection import AWSAuthConnection, AWSQueryConnection
 from wrapt import ObjectProxy, wrap_function_wrapper
 
-from opentelemetry.auto_instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.ext.boto.version import __version__
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.trace import SpanKind, get_tracer
 
 logger = logging.getLogger(__name__)

ext/opentelemetry-ext-dbapi/setup.cfg

@@ -41,6 +41,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 0.9.dev0
+    opentelemetry-instrumentation == 0.9.dev0
     wrapt >= 1.0.0, < 2.0.0
 
 [options.extras_require]