Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/asyncio instrumentation #1943

Merged
merged 76 commits into from
Feb 14, 2024
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
fc3bcff
add asyncio instrumentation
bourbonkk Sep 11, 2023
e05b02b
add asyncio instrumentation
bourbonkk Sep 11, 2023
143000a
modify test configure
bourbonkk Sep 11, 2023
5eb088d
modify test configure
bourbonkk Sep 11, 2023
0b3da0e
modify tox generate result
bourbonkk Sep 11, 2023
56d0c02
modify tox generate result
bourbonkk Sep 11, 2023
55f2325
add python version check
bourbonkk Sep 11, 2023
d3facc4
modify test code
bourbonkk Sep 11, 2023
7581c30
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Sep 11, 2023
31b6157
add CHANGELOG.md
bourbonkk Sep 11, 2023
0bfc1c8
Merge remote-tracking branch 'origin/feature/asyncio-instrumentation'…
bourbonkk Sep 11, 2023
357453a
add docs
bourbonkk Sep 12, 2023
77469d9
modify pyproject.toml
bourbonkk Sep 13, 2023
5e8b7ab
modify pyproject.toml
bourbonkk Sep 13, 2023
61f2c85
Add comments mentioned in an issue #1919
bourbonkk Sep 16, 2023
5e522e2
Add comments mentioned in an issue #1919
bourbonkk Sep 16, 2023
0c7b121
Merge branch 'main' into feature/asyncio-instrumentation
ocelotl Oct 1, 2023
1859cb8
add asyncio component owner
bourbonkk Oct 1, 2023
9d4344a
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Oct 4, 2023
d342d8c
- Add instrumentation-asyncio metric.
bourbonkk Oct 9, 2023
3adc0cd
modify docs
bourbonkk Oct 9, 2023
a56cd65
modify docs
bourbonkk Oct 9, 2023
3356942
modify docs
bourbonkk Oct 10, 2023
b4c453c
modify docs
bourbonkk Oct 10, 2023
bf76ff3
modify docs
bourbonkk Oct 10, 2023
15c0375
modify test_code
bourbonkk Oct 10, 2023
9cce290
modify test_code
bourbonkk Oct 10, 2023
6975ab7
modify test_code
bourbonkk Oct 10, 2023
bbfb065
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Oct 10, 2023
fe89033
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 1, 2023
0d23386
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 2, 2023
aa48c40
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 3, 2023
26c4498
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 8, 2023
6bd4ace
modify asyncio version
bourbonkk Nov 8, 2023
86f137c
modify asyncio version
bourbonkk Nov 8, 2023
7e40c0b
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 14, 2023
b4ffc63
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Nov 17, 2023
ffc043b
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Dec 3, 2023
bcf3172
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Dec 19, 2023
0c60d34
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Dec 23, 2023
8b077af
update dependency
bourbonkk Dec 23, 2023
9259d72
modified lint results
bourbonkk Dec 23, 2023
05e6a74
modified lint results
bourbonkk Dec 23, 2023
39d0a53
modified lint results
bourbonkk Dec 23, 2023
3603290
modified lint results
bourbonkk Dec 23, 2023
7cc4618
modified lint results
bourbonkk Dec 23, 2023
1f0f340
modified lint results
bourbonkk Dec 23, 2023
b036ba3
modified lint results
bourbonkk Dec 23, 2023
a8d5e16
include feedback
bourbonkk Jan 3, 2024
936dc37
include feedback
bourbonkk Jan 4, 2024
69c15e8
include feedback
bourbonkk Jan 4, 2024
f8a0b5e
modify docs test results
bourbonkk Jan 4, 2024
2c6d944
Update instrumentation/opentelemetry-instrumentation-asyncio/README.rst
bourbonkk Jan 4, 2024
214a851
Update instrumentation/opentelemetry-instrumentation-asyncio/README.rst
bourbonkk Jan 4, 2024
f11322a
Update instrumentation/opentelemetry-instrumentation-asyncio/README.rst
bourbonkk Jan 4, 2024
ef45d62
Update instrumentation/opentelemetry-instrumentation-asyncio/README.rst
bourbonkk Jan 4, 2024
e93aa9b
Update instrumentation/opentelemetry-instrumentation-asyncio/src/open…
bourbonkk Jan 4, 2024
b9a303d
Update instrumentation/opentelemetry-instrumentation-asyncio/src/open…
bourbonkk Jan 4, 2024
5f7bd4b
include feedback
bourbonkk Jan 5, 2024
b3f4604
include feedback
bourbonkk Jan 5, 2024
1d536a5
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 8, 2024
e004986
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 10, 2024
e85b9d5
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 11, 2024
beaa519
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 16, 2024
4687b20
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 23, 2024
20083fb
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Jan 28, 2024
e596456
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Feb 1, 2024
8c91fa5
Merge branch 'main' into feature/asyncio-instrumentation
ocelotl Feb 5, 2024
eb5e156
drop python 3.7 support
bourbonkk Feb 5, 2024
9ac37a0
drop python 3.7 support
bourbonkk Feb 5, 2024
9c75294
Removed from default_instrumentations
bourbonkk Feb 13, 2024
8512d8e
Merge branch 'main' into feature/asyncio-instrumentation
bourbonkk Feb 13, 2024
e84ee7c
Recover
bourbonkk Feb 13, 2024
48be2c3
Merge remote-tracking branch 'origin/feature/asyncio-instrumentation'…
bourbonkk Feb 13, 2024
41ecf14
Merge branch 'main' into feature/asyncio-instrumentation
ocelotl Feb 14, 2024
611a717
Merge branch 'main' into feature/asyncio-instrumentation
ocelotl Feb 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,6 @@ components:

instrumentation/opentelemetry-instrumentation-cassandra:
- mattcontinisio

instrumentation/opentelemetry-instrumentation-asyncio:
- bourbonkk
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Version 1.22.0/0.43b0 (2023-12-14)

### Added

- `opentelemetry-instrumentation-asyncio` Add support for asyncio
([#1919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1943))
- `opentelemetry-instrumentation` Added Otel semantic convention opt-in mechanism
([#1987](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1987))
- `opentelemetry-instrumentation-httpx` Fix mixing async and non async hooks
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ The continuation integration overrides that environment variable with as per the
Below is a checklist of things to be mindful of when implementing a new instrumentation or working on a specific instrumentation. It is one of our goals as a community to keep the implementation specific details of instrumentations as similar across the board as possible for ease of testing and feature parity. It is also good to abstract as much common functionality as possible.

- Follow semantic conventions
- The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/semantic_conventions)
- The instrumentation should follow the semantic conventions defined [here](https://github.com/open-telemetry/opentelemetry-specification/tree/main/specification/semantic-conventions.md)
- Extends from [BaseInstrumentor](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/opentelemetry-instrumentation/src/opentelemetry/instrumentation/instrumentor.py#L26)
- Supports auto-instrumentation
- Add an entry point (ex. https://github.com/open-telemetry/opentelemetry-python-contrib/blob/f045c43affff6ff1af8fa2f7514a4fdaca97dacf/instrumentation/opentelemetry-instrumentation-requests/pyproject.toml#L44)
Expand Down
7 changes: 7 additions & 0 deletions docs/instrumentation/asyncio/asyncio.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry asyncio Instrumentation
==============================================

.. automodule:: opentelemetry.instrumentation.asyncio
:members:
:undoc-members:
:show-inheritance:
1 change: 1 addition & 0 deletions instrumentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
| [opentelemetry-instrumentation-aiohttp-server](./opentelemetry-instrumentation-aiohttp-server) | aiohttp ~= 3.0 | No
| [opentelemetry-instrumentation-aiopg](./opentelemetry-instrumentation-aiopg) | aiopg >= 0.13.0, < 2.0.0 | No
| [opentelemetry-instrumentation-asgi](./opentelemetry-instrumentation-asgi) | asgiref ~= 3.0 | No
| [opentelemetry-instrumentation-asyncio](./opentelemetry-instrumentation-asyncio) | asyncio | No
bourbonkk marked this conversation as resolved.
Show resolved Hide resolved
| [opentelemetry-instrumentation-asyncpg](./opentelemetry-instrumentation-asyncpg) | asyncpg >= 0.12.0 | No
| [opentelemetry-instrumentation-aws-lambda](./opentelemetry-instrumentation-aws-lambda) | aws_lambda | No
| [opentelemetry-instrumentation-boto](./opentelemetry-instrumentation-boto) | boto~=2.0 | No
Expand Down
201 changes: 201 additions & 0 deletions instrumentation/opentelemetry-instrumentation-asyncio/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

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.
110 changes: 110 additions & 0 deletions instrumentation/opentelemetry-instrumentation-asyncio/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
OpenTelemetry asyncio Instrumentation
======================================

|pypi|

.. |pypi| image:: https://badge.fury.io/py/opentelemetry-instrumentation-asyncio.svg
:target: https://pypi.org/project/opentelemetry-instrumentation-asyncio/

AsyncioInstrumentor: Tracing Requests Made by the Asyncio Library


The opentelemetry-instrumentation-asyncio package allows tracing asyncio applications.
It also includes metrics for duration and counts of coroutines and futures. Metrics are generated even if coroutines are not traced.


Set the names of coroutines you want to trace.
-------------------------------------------------
.. code:: bash

export OTEL_PYTHON_ASYNCIO_COROUTINE_NAMES_TO_TRACE=coro_name,coro_name2,coro_name3

If you want to trace specific blocking functions executed with the ``to_thread`` function of asyncio, set the name of the functions in ``OTEL_PYTHON_ASYNCIO_TO_THREAD_FUNCTION_NAMES_TO_TRACE``.
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
.. code:: bash

export OTEL_PYTHON_ASYNCIO_TO_THREAD_FUNCTION_NAMES_TO_TRACE=func_name,func_name2,func_name3

You can enable tracing futures with ``OTEL_PYTHON_ASYNCIO_FUTURE_TRACE_ENABLED``
-----------------------------------------------------------------------------------------------
.. code:: bash

export OTEL_PYTHON_ASYNCIO_FUTURE_TRACE_ENABLED=true

Run instrumented application
-----------------------------
1. coroutine
--------------------
.. code:: python

# export OTEL_PYTHON_ASYNCIO_COROUTINE_NAMES_TO_TRACE=sleep

import asyncio
from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor

AsyncioInstrumentor().instrument()

async def main():
await asyncio.create_task(asyncio.sleep(0.1))

asyncio.run(main())

2. future
--------------------
.. code:: python

# export OTEL_PYTHON_ASYNCIO_FUTURE_TRACE_ENABLED=true

loop = asyncio.get_event_loop()

future = asyncio.Future()
future.set_result(1)
task = asyncio.ensure_future(future)
loop.run_until_complete(task)

3. to_thread
--------------------
.. code:: python

# export OTEL_PYTHON_ASYNCIO_TO_THREAD_FUNCTION_NAMES_TO_TRACE=func

import asyncio
from opentelemetry.instrumentation.asyncio import AsyncioInstrumentor

AsyncioInstrumentor().instrument()

async def main():
await asyncio.to_thread(func)

def func():
pass

asyncio.run(main())


asyncio metric types
----------------------

* `asyncio.process.duration` (seconds) - Duration of asyncio process
* `asyncio.process.count` (count) - Number of asyncio process


API
---



Installation
------------

::

pip install opentelemetry-instrumentation-asyncio


References
-----------

* `OpenTelemetry asyncio/ Tracing <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/asyncio/asyncio.html>`_
* `OpenTelemetry Project <https://opentelemetry.io/>`_
* `OpenTelemetry Python Examples <https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples>`_
Loading
Loading