Skip to content

Commit 8c07b89

Browse files
committed
wip
1 parent ca46009 commit 8c07b89

File tree

1 file changed

+22
-18
lines changed
  • opentelemetry-auto-instrumentation/src/opentelemetry/auto_instrumentation

1 file changed

+22
-18
lines changed

opentelemetry-auto-instrumentation/src/opentelemetry/auto_instrumentation/bootstrap.py

+22-18
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,32 @@
2222

2323
logger = getLogger(__file__)
2424

25-
_ACTION_INSTALL = "install"
26-
_ACTION_REQUIREMENTS = "requirements"
27-
2825

2926
# target library to desired instrumentor path/versioned package name
3027
instrumentations = {
31-
"dbapi": "opentelemetry-ext-dbapi>=0.6b0",
32-
"flask": "opentelemetry-ext-flask>=0.6b0",
33-
"grpc": "opentelemetry-ext-grpc>=0.6b0",
34-
"requests": "opentelemetry-ext-requests>=0.6b0",
35-
"mysql": "opentelemetry-ext-mysql>=0.6b0",
36-
"psycopg2": "opentelemetry-ext-psycopg2>=0.6b0",
37-
"pymongo": "opentelemetry-ext-pymongo>=0.6b0",
38-
"pymysql": "opentelemetry-ext-pymysql",
39-
"redis": "opentelemetry-ext-redis",
40-
"sqlalchemy": "opentelemetry-ext-sqlalchemy",
41-
"wsgi": "opentelemetry-ext-wsgi>=0.6b0",
28+
"dbapi": "opentelemetry-ext-dbapi>=0.7b1",
29+
"dbapi": "opentelemetry-ext-djando>=0.7b1",
30+
"flask": "opentelemetry-ext-flask>=0.7b1",
31+
"grpc": "opentelemetry-ext-grpc>=0.7b1",
32+
"requests": "opentelemetry-ext-requests>=0.7b1",
33+
"jinja2": "opentelemetry-ext-jinja2>=0.7b1",
34+
"mysql": "opentelemetry-ext-mysql>=0.7b1",
35+
"psycopg2": "opentelemetry-ext-psycopg2>=0.7b1",
36+
"pymongo": "opentelemetry-ext-pymongo>=0.7b1",
37+
"pymysql": "opentelemetry-ext-pymysql>=0.7b1",
38+
"redis": "opentelemetry-ext-redis>=0.7b1",
39+
"sqlalchemy": "opentelemetry-ext-sqlalchemy>=0.7b1",
40+
"wsgi": "opentelemetry-ext-wsgi>=0.7b1",
4241
}
4342

4443
# relevant instrumentors and tracers to uninstall and check for conflicts for target libraries
4544
libraries = {
4645
"dbapi": ("opentelemetry-ext-dbapi",),
46+
"django": ("opentelemetry-ext-django",),
4747
"flask": ("opentelemetry-ext-flask",),
4848
"grpc": ("opentelemetry-ext-grpc",),
4949
"requests": ("opentelemetry-ext-requests",),
50+
"jinja2": ("opentelemetry-ext-jinja2",),
5051
"mysql": ("opentelemetry-ext-mysql",),
5152
"psycopg2": ("opentelemetry-ext-psycopg2",),
5253
"pymongo": ("opentelemetry-ext-pymongo",),
@@ -150,6 +151,9 @@ def _run_install(packages):
150151

151152

152153
def run() -> None:
154+
action_install = "install"
155+
action_requirements = "requirements"
156+
153157
parser = argparse.ArgumentParser(
154158
description="""
155159
opentelemetry-bootstrap detects installed libraries and automatically
@@ -159,8 +163,8 @@ def run() -> None:
159163
parser.add_argument(
160164
"-a",
161165
"--action",
162-
choices=[_ACTION_INSTALL, _ACTION_REQUIREMENTS],
163-
default=_ACTION_REQUIREMENTS,
166+
choices=[action_install, action_requirements],
167+
default=action_requirements,
164168
help="""
165169
install - uses pip to install the new requirements using to the
166170
currently active site-package.
@@ -171,7 +175,7 @@ def run() -> None:
171175
args = parser.parse_args()
172176

173177
cmd = {
174-
_ACTION_INSTALL: _run_install,
175-
_ACTION_REQUIREMENTS: _run_requirements,
178+
action_install: _run_install,
179+
action_requirements: _run_requirements,
176180
}[args.action]
177181
cmd(_find_installed_libraries())

0 commit comments

Comments
 (0)