Skip to content

Commit 1041e11

Browse files
authored
refactor: Add common utils to opentelemetry-auto-instrumentation, rename opentelemetry-auto-instrumentation (open-telemetry#741)
1 parent 7ad8bbc commit 1041e11

File tree

60 files changed

+279
-295
lines changed

Some content is hidden

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

60 files changed

+279
-295
lines changed

docs/auto_instrumentation/auto_instrumentation.rst

Lines changed: 0 additions & 15 deletions
This file was deleted.

docs/auto_instrumentation/instrumentor.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
source_dirs = [
2828
os.path.abspath("../opentelemetry-api/src/"),
2929
os.path.abspath("../opentelemetry-sdk/src/"),
30-
os.path.abspath("../opentelemetry-auto-instrumentation/src/"),
30+
os.path.abspath("../opentelemetry-instrumentation/src/"),
3131
]
3232

3333
ext = "../ext"

docs/examples/auto-instrumentation/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Installation
7272
.. code:: sh
7373
7474
$ pip install opentelemetry-sdk
75-
$ pip install opentelemetry-auto-instrumentation
75+
$ pip install opentelemetry-instrumentation
7676
$ pip install opentelemetry-ext-flask
7777
$ pip install requests
7878
@@ -138,7 +138,7 @@ and run this instead:
138138

139139
.. code:: sh
140140
141-
$ opentelemetry-auto-instrumentation python server_uninstrumented.py
141+
$ opentelemetry-instrument python server_uninstrumented.py
142142
143143
In the console where you previously executed ``client.py``, run again
144144
this again:

docs/examples/datadog_exporter/README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Auto-Instrumention Example
4444
pip install opentelemetry-api
4545
pip install opentelemetry-sdk
4646
pip install opentelemetry-ext-datadog
47-
pip install opentelemetry-auto-instrumentation
47+
pip install opentelemetry-instrumentation
4848
pip install opentelemetry-ext-flask
4949
pip install flask
5050
pip install requests
@@ -66,16 +66,16 @@ Auto-Instrumention Example
6666

6767
.. code-block:: sh
6868
69-
opentelemetry-auto-instrumentation python server.py
69+
opentelemetry-instrument python server.py
7070
7171
* Run client
7272

7373
.. code-block:: sh
7474
75-
opentelemetry-auto-instrumentation python client.py testing
75+
opentelemetry-instrument python client.py testing
7676
7777
* Run client with parameter to raise error
7878

7979
.. code-block:: sh
8080
81-
opentelemetry-auto-instrumentation python client.py error
81+
opentelemetry-instrument python client.py error

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
6868

6969
api/api
7070
sdk/sdk
71-
auto_instrumentation/auto_instrumentation
71+
instrumentation/instrumentation
7272

7373
.. toctree::
7474
:maxdepth: 2
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
OpenTelemetry Python Instrumentation
2+
====================================
3+
4+
.. automodule:: opentelemetry.instrumentation
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:
8+
9+
Submodules
10+
----------
11+
12+
.. toctree::
13+
:maxdepth: 1
14+
15+
instrumentor
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
opentelemetry.instrumentation.instrumentor package
2+
==================================================
3+
4+
.. automodule:: opentelemetry.instrumentation.instrumentor
5+
:members:
6+
:undoc-members:
7+
:show-inheritance:

eachdist.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
sortfirst=
55
opentelemetry-api
66
opentelemetry-sdk
7-
opentelemetry-auto-instrumentation
7+
opentelemetry-instrumentation
88
ext/opentelemetry-ext-wsgi
99
ext/opentelemetry-ext-dbapi
1010
ext/*

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ package_dir=
4040
packages=find_namespace:
4141
install_requires =
4242
opentelemetry-api >= 0.9.dev0
43+
opentelemetry-instrumentation == 0.9.dev0
4344
aiohttp ~= 3.0
4445

4546
[options.packages.find]

0 commit comments

Comments
 (0)