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.

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

Add missing references to instrumented packages #1416

Merged
merged 3 commits into from
Nov 25, 2020
+19 −3
Merged

Add missing references to instrumented packages #1416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19cf4a7
Add missing references to instrumented packages
NathanielRN Nov 25, 2020
f912baf
Add comment regarding mapping of instrumentations
NathanielRN Nov 25, 2020
b8b31ff
Merge branch 'master' into update-bootstrap-packages
Nov 25, 2020
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 opentelemetry-instrumentation/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
- Add IDs Generator as Configurable Property of Auto Instrumentation
([#1404](https://github.com/open-telemetry/opentelemetry-python/pull/1404))
- Added support for `OTEL_EXPORTER` to the `opentelemetry-instrument` command ([#1036](https://github.com/open-telemetry/opentelemetry-python/pull/1036))
- Add missing references to instrumented packages
([#1416](https://github.com/open-telemetry/opentelemetry-python/pull/1416))

## Version 0.14b0

Expand Down
20 changes: 17 additions & 3 deletions opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,18 @@
logger = getLogger(__file__)


# target library to desired instrumentor path/versioned package name
# A mapping of "target library" to "desired instrumentor path/versioned package
# name". Used as part of the `opentelemetry-bootstrap` command which looks at
# libraries used by the application that is to be instrumented, and handles
# automatically installing the appropriate instrumentations for that app.
# This helps for those who prefer to turn on as much instrumentation as
# possible, and don't want to go through the manual process of combing through
# the libraries their application uses to figure which one can be
# instrumented.
# NOTE: system-metrics is not to be included.
instrumentations = {
"aiohttp-client": "opentelemetry-instrumentation-aiohttp-client>=0.15b0",
Copy link
Member

Choose a reason for hiding this comment

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

could you add the comment I asked above this, maybe right below the imports?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sweet that is super helpful! Added a comment :)

"aiopg": "opentelemetry-instrumentation-aiopg>=0.15b0",
"asgi": "opentelemetry-instrumentation-asgi>=0.11b0",
"asyncpg": "opentelemetry-instrumentation-asyncpg>=0.11b0",
"boto": "opentelemetry-instrumentation-boto>=0.11b0",
Expand All @@ -33,8 +43,8 @@
"dbapi": "opentelemetry-instrumentation-dbapi>=0.8b0",
"django": "opentelemetry-instrumentation-django>=0.8b0",
"elasticsearch": "opentelemetry-instrumentation-elasticsearch>=0.11b0",
"fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0",
"falcon": "opentelemetry-instrumentation-falcon>=0.13b0",
"fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0",
"flask": "opentelemetry-instrumentation-flask>=0.8b0",
"grpc": "opentelemetry-instrumentation-grpc>=0.8b0",
"jinja2": "opentelemetry-instrumentation-jinja2>=0.8b0",
Expand All @@ -46,6 +56,7 @@
"pyramid": "opentelemetry-instrumentation-pyramid>=0.11b0",
"redis": "opentelemetry-instrumentation-redis>=0.8b0",
"requests": "opentelemetry-instrumentation-requests>=0.8b0",
"sklearn": "opentelemetry-instrumentation-sklearn>=0.15b0",
"sqlalchemy": "opentelemetry-instrumentation-sqlalchemy>=0.8b0",
"sqlite3": "opentelemetry-instrumentation-sqlite3>=0.11b0",
"starlette": "opentelemetry-instrumentation-starlette>=0.11b0",
Expand All @@ -55,6 +66,8 @@

# relevant instrumentors and tracers to uninstall and check for conflicts for target libraries
libraries = {
"aiohttp-client": ("opentelemetry-instrumentation-aiohttp-client",),
"aiopg": ("opentelemetry-instrumentation-aiopg",),
"asgi": ("opentelemetry-instrumentation-asgi",),
"asyncpg": ("opentelemetry-instrumentation-asyncpg",),
"boto": ("opentelemetry-instrumentation-boto",),
Expand All @@ -63,8 +76,8 @@
"dbapi": ("opentelemetry-instrumentation-dbapi",),
"django": ("opentelemetry-instrumentation-django",),
"elasticsearch": ("opentelemetry-instrumentation-elasticsearch",),
"fastapi": ("opentelemetry-instrumentation-fastapi",),
"falcon": ("opentelemetry-instrumentation-falcon",),
"fastapi": ("opentelemetry-instrumentation-fastapi",),
"flask": ("opentelemetry-instrumentation-flask",),
"grpc": ("opentelemetry-instrumentation-grpc",),
"jinja2": ("opentelemetry-instrumentation-jinja2",),
Expand All @@ -76,6 +89,7 @@
"pyramid": ("opentelemetry-instrumentation-pyramid",),
"redis": ("opentelemetry-instrumentation-redis",),
"requests": ("opentelemetry-instrumentation-requests",),
"sklearn": ("opentelemetry-instrumentation-sklearn",),
"sqlalchemy": ("opentelemetry-instrumentation-sqlalchemy",),
"sqlite3": ("opentelemetry-instrumentation-sqlite3",),
"starlette": ("opentelemetry-instrumentation-starlette",),
Expand Down