Skip to content

Add pre and post instrument entrypoints #1983

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Sep 9, 2021
Merged

Add pre and post instrument entrypoints #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9fa72fd
Add pre and post instrument entry points
ocelotl Jul 18, 2021
e8cef30
Revert "Add pre and post instrument entry points"
ocelotl Aug 25, 2021
23f2853
Add pre and post instrument entry points
ocelotl Aug 25, 2021
5fd5a82
Add changelog
ocelotl Aug 26, 2021
f90a748
Merge branch 'main' into issue_1982
ocelotl Aug 30, 2021
5d88f7f
Merge branch 'main' into issue_1982
owais Sep 9, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.5.0-0.24b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.5.0-0.24b0) - 2021-08-26


- Add pre and post instrumentation entry points
([#1983](https://github.com/open-telemetry/opentelemetry-python/pull/1983))
- Fix documentation on well known exporters and variable OTEL_TRACES_EXPORTER which were misnamed
([#2023](https://github.com/open-telemetry/opentelemetry-python/pull/2023))
- `opentelemetry-sdk` `get_aggregated_resource()` returns default resource and service name
Expand Down
6 changes: 6 additions & 0 deletions ...y-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ def _load_instrumentors(distro):
# to handle users entering "requests , flask" or "requests, flask" with spaces
package_to_exclude = [x.strip() for x in package_to_exclude]

for entry_point in iter_entry_points("opentelemetry_pre_instrument"):
entry_point.load()()

for entry_point in iter_entry_points("opentelemetry_instrumentor"):
if entry_point.name in package_to_exclude:
logger.debug(
Expand All @@ -84,6 +87,9 @@ def _load_instrumentors(distro):
logger.exception("Instrumenting of %s failed", entry_point.name)
raise exc

for entry_point in iter_entry_points("opentelemetry_post_instrument"):
entry_point.load()()


def _load_configurators():
configured = None
Expand Down