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

Add instrumentation for threading module #1582

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
12e3fff
Add instrumenation for threading
pridhi-arora Jan 15, 2023
3d1ec3a
Added tests for threading instrumentation
pridhi-arora Jan 16, 2023
bcfe04a
Updated tox.ini for threading module
pridhi-arora Jan 17, 2023
46c5394
Removed instrumentation dependencies
pridhi-arora Jan 18, 2023
5456f9b
Updated test file
pridhi-arora Jan 19, 2023
fb8df3c
Updated README
pridhi-arora Jan 19, 2023
ca8b114
Added comments to test
pridhi-arora Jan 20, 2023
c8d8f69
Updated init and test files
pridhi-arora Jan 27, 2023
dcd388b
Modified test file
pridhi-arora Feb 1, 2023
9e3b007
Update instrumentation/opentelemetry-instrumentation-threading/README…
pridhi-arora Feb 2, 2023
d3a2d90
Update instrumentation/opentelemetry-instrumentation-threading/README…
pridhi-arora Feb 2, 2023
c13a4b7
Update instrumentation/opentelemetry-instrumentation-threading/README…
pridhi-arora Feb 2, 2023
4d5625f
Update instrumentation/opentelemetry-instrumentation-threading/src/op…
pridhi-arora Feb 2, 2023
260c7f9
Updated according to review comments and added uninstrumentation code
pridhi-arora Feb 2, 2023
aec3ff9
add instrumentor base class
pridhi-arora Feb 7, 2023
5cc3e6f
Fixed tests
pridhi-arora Feb 10, 2023
bf2b5bb
Add context to run function and fix tests
pridhi-arora Feb 10, 2023
3704f68
Adds more tests
pridhi-arora Feb 15, 2023
4c100ea
Update instrumentation/opentelemetry-instrumentation-threading/tests/…
pridhi-arora Feb 16, 2023
2a38a50
Update instrumentation/opentelemetry-instrumentation-threading/pyproj…
pridhi-arora Feb 16, 2023
5e6bd84
code cleanup
pridhi-arora Feb 16, 2023
c528784
Updated the versions
pridhi-arora Feb 20, 2023
075107c
Update instrumentation/opentelemetry-instrumentation-threading/src/op…
srikanthccv Feb 20, 2023
2f89aaa
Updated default dependency and project.toml
pridhi-arora Feb 20, 2023
2b22b2f
Added comments to test scenarios
pridhi-arora Feb 20, 2023
147f3d4
Update CHANGELOG
pridhi-arora Feb 22, 2023
a70ea70
Fix all lint issues
pridhi-arora Mar 2, 2023
971e864
Update CHANGELOG
pridhi-arora Mar 2, 2023
8f50ce4
Update CHANGELOG.md
pridhi-arora Mar 2, 2023
9315652
Update instrumentation/opentelemetry-instrumentation-threading/src/op…
pridhi-arora Mar 2, 2023
2181ccc
Update Docs
pridhi-arora Mar 10, 2023
22a396f
Update docs/instrumentation/threading/threading.rst
ocelotl Jun 28, 2023
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#1608](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1608))
- Add support for enabling Redis sanitization from environment variable
([#1690](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1690))
- `opentelemetry-instrumentation-threading` Add instrumentation for python threading module
([#1582](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1582))


### Fixed

Expand All @@ -27,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- `opentelemetry-instrumentation-system-metrics` Fix initialization of the instrumentation class when configuration is provided
([#1438](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1439))


## Version 1.16.0/0.37b0 (2023-02-17)

### Added
Expand Down
1 change: 1 addition & 0 deletions instrumentation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
| [opentelemetry-instrumentation-sqlite3](./opentelemetry-instrumentation-sqlite3) | sqlite3 | No
| [opentelemetry-instrumentation-starlette](./opentelemetry-instrumentation-starlette) | starlette ~= 0.13.0 | Yes
| [opentelemetry-instrumentation-system-metrics](./opentelemetry-instrumentation-system-metrics) | psutil >= 5 | No
| [opentelemetry-instrumentation-threading](./opentelemetry-instrumentation-threading) | threading | No
| [opentelemetry-instrumentation-tornado](./opentelemetry-instrumentation-tornado) | tornado >= 5.1.1 | Yes
| [opentelemetry-instrumentation-tortoiseorm](./opentelemetry-instrumentation-tortoiseorm) | tortoise-orm >= 0.17.0 | No
| [opentelemetry-instrumentation-urllib](./opentelemetry-instrumentation-urllib) | urllib | Yes
Expand Down
201 changes: 201 additions & 0 deletions instrumentation/opentelemetry-instrumentation-threading/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.
22 changes: 22 additions & 0 deletions instrumentation/opentelemetry-instrumentation-threading/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
OpenTelemetry Threading Instrumentation
=======================================

|pypi|

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


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

::

pip install opentelemetry-instrumentation-threading

References
----------

* `OpenTelemetry Threading Instrumentation <https://opentelemetry-python-contrib.readthedocs.io/en/latest/instrumentation/threading/threading.html>`_
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't look we added this page to the docs. Need an RST in https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/docs/instrumentation right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will add an RST to the docs.

* `OpenTelemetry Project <https://opentelemetry.io/>`_
* `OpenTelemetry Python Examples <https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples>`_
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "opentelemetry-instrumentation-threading"
dynamic = ["version"]
description = "Threading instrumentation for OpenTelemetry"
readme = "README.rst"
license = "Apache-2.0"
requires-python = ">=3.7"
authors = [
{ name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" },
]
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"opentelemetry-api ~= 1.12",
"opentelemetry-instrumentation == 0.38b0.dev",
]

[project.optional-dependencies]
instruments = []
test = [
"opentelemetry-instrumentation-threading[instruments]",
"opentelemetry-test-utils == 0.38b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
threading = "opentelemetry.instrumentation.threading:ThreadingInstrumentor"

[project.urls]
Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-threading"

[tool.hatch.version]
path = "src/opentelemetry/instrumentation/threading/version.py"

[tool.hatch.build.targets.sdist]
include = [
"/src",
"/tests",
]

[tool.hatch.build.targets.wheel]
packages = ["src/opentelemetry"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# 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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you add a docs page, it should pull in the module docstring with autodoc.

Afaict this instrumentation only propagates context to child threads. Can you add a docstring explaining what this does and any caveats?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaict this instrumentation only propagates context to child threads

Yes

Can you add a docstring explaining what this does and any caveats?

I think this is a good point and we should document the fact that this initial version doesn't support user subclassed threading.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where should I add this docstring?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is an example

"""
This library allows tracing HTTP requests made by the
`urllib <https://docs.python.org/3/library/urllib>`_ library.
Usage
-----
.. code-block:: python
from urllib import request
from opentelemetry.instrumentation.urllib import URLLibInstrumentor
# You can optionally pass a custom TracerProvider to
# URLLibInstrumentor().instrument()
URLLibInstrumentor().instrument()
req = request.Request('https://postman-echo.com/post', method="POST")
r = request.urlopen(req)
Configuration
-------------
Request/Response hooks
**********************
The urllib instrumentation supports extending tracing behavior with the help of
request and response hooks. These are functions that are called back by the instrumentation
right after a Span is created for a request and right before the span is finished processing a response respectively.
The hooks can be configured as follows:
.. code:: python
# `request_obj` is an instance of urllib.request.Request
def request_hook(span, request_obj):
pass
# `request_obj` is an instance of urllib.request.Request
# `response` is an instance of http.client.HTTPResponse
def response_hook(span, request_obj, response)
pass
URLLibInstrumentor.instrument(
request_hook=request_hook, response_hook=response_hook)
)
API
---
"""
.

We should also add that this enables the context propagation for threaded programs and that it doesn't currently support the subclassed user threads.

# pylint: disable=empty-docstring,no-value-for-parameter,no-member,no-name-in-module

import threading # pylint: disable=import-self
from typing import Collection

from opentelemetry import context, trace
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
from opentelemetry.instrumentation.threading.package import _instruments
from opentelemetry.instrumentation.threading.version import __version__
from opentelemetry.trace import (
get_current_span,
get_tracer,
get_tracer_provider,
)


class _InstrumentedThread(threading.Thread):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._parent_span = None

def start(self):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this method necessary here? From the docs:

Once a thread object is created, its activity must be started by calling the thread’s start() method. This invokes the run() method in a separate thread of control.

Also:

In other words, only override the init() and run() methods of this class.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you did self._parent_span = get_current_span() in __init__(), the new thread would inherit the context of the thread that created the new thread object. Here, the new thread inherits the context of the thread that calls start().

In the vast majority of cases they are probably the same caller though. Is this an intentional distinction @pridhi-arora ? Otherwise I agree with Diego that would be simpler

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the current context may be different when one creates the thread object vs when it gets called. Take the following scenario.

user_thread = threading.Thread(target=func, args=('hyd',))

with tracer.start_as_current_span("foo"):
  bar()
  user_thread.start()

It would be incorrect to use any span context other than "foo" right? We need this for that reason.

self._parent_span = get_current_span()
super().start()

def run(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the python docs

There are two ways to specify the activity: by passing a callable object to the constructor, or by overriding the run() method in a subclass.

This looks good for the first way (passing a callable) but it won't work right for second way of subclassing Thread, correct?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless they call super().run() in the overriden run.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but users shouldn't have to modify their code for this instrumentation to work

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, they may not already have that call in their code.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's OK if we leave this out of scope for now, we should just document the caveat

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, this may work:

import threading
from time import sleep


class InstrumentedThread(threading.Thread):

    def __getattribute__(self, name):
        if name == "run":
            print("instrumenting")

        return object.__getattribute__(self, name)


threading.Thread = InstrumentedThread

from threading import Thread  # noqa


def function():
    for _ in range(5):
        print("function")
        sleep(0.1)


user_thread_0 = Thread(target=function)
user_thread_0.start()


class UserThread(Thread):

    def run(self):
        for _ in range(5):
            print("run")
            sleep(0.1)


user_thread_1 = UserThread()
user_thread_1.start()
instrumenting
function
instrumenting
run
function
run
function
run
function
run
function
run

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to leave this out of scope for the initial version and address it separately.

parent_span = self._parent_span or get_current_span()
ctx = trace.set_span_in_context(parent_span)
context.attach(ctx)
super().run()


class ThreadingInstrumentor(
BaseInstrumentor
): # pylint: disable=empty-docstring
original_threadcls = threading.Thread

def instrumentation_dependencies(self) -> Collection[str]:
return _instruments

def _instrument(self, *args, **kwargs):
tracer_provider = (
kwargs.get("tracer_provider", None) or get_tracer_provider()
)

tracer = get_tracer(__name__, __version__, tracer_provider)
threading.Thread = _InstrumentedThread
_InstrumentedThread._tracer = tracer

def _uninstrument(self, **kwargs):
threading.Thread = self.original_threadcls
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# 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.

_instruments = ()

_supports_metrics = False
Loading