Skip to content

Commit f14a04f

Browse files
cnnradamscnnradams
committed
Merge branch 'master' into grpc_client_testing
2 parents c3009a4 + 2a952b3 commit f14a04f

File tree

4 files changed

+41
-20
lines changed

4 files changed

+41
-20
lines changed

‎docs/examples/django/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Open up a new console and activate the previous virtual environment there too:
5656

5757
``source django_auto_instrumentation/bin/activate``
5858

59-
Go to ``opentelemetry-python/ext/opentelemetry-ext-django/example``, once there
59+
Go to ``opentelemetry-python/docs/examples/django``, once there
6060
run the client with:
6161

6262
``python client.py hello``

‎docs/examples/django/pages/views.py

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
)
2222

2323
trace.set_tracer_provider(TracerProvider())
24-
tracer = trace.get_tracer_provider().get_tracer(__name__)
2524

2625
trace.get_tracer_provider().add_span_processor(
2726
SimpleExportSpanProcessor(ConsoleSpanExporter())

‎opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py

+24-2
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,57 @@
2525

2626
# target library to desired instrumentor path/versioned package name
2727
instrumentations = {
28+
"asgi": "opentelemetry-ext-asgi>=0.11b0",
29+
"asyncpg": "opentelemetry-ext-asyncpg>=0.11b0",
30+
"boto": "opentelemetry-ext-boto>=0.11b0",
31+
"botocore": "opentelemetry-ext-botocore>=0.11b0",
32+
"celery": "opentelemetry-ext-celery>=0.11b0",
2833
"dbapi": "opentelemetry-ext-dbapi>=0.8b0",
2934
"django": "opentelemetry-ext-django>=0.8b0",
35+
"elasticsearch": "opentelemetry-ext-elasticsearch>=0.11b0",
36+
"fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0",
3037
"flask": "opentelemetry-ext-flask>=0.8b0",
3138
"grpc": "opentelemetry-ext-grpc>=0.8b0",
32-
"requests": "opentelemetry-ext-requests>=0.8b0",
3339
"jinja2": "opentelemetry-ext-jinja2>=0.8b0",
3440
"mysql": "opentelemetry-ext-mysql>=0.8b0",
3541
"psycopg2": "opentelemetry-ext-psycopg2>=0.8b0",
42+
"pymemcache": "opentelemetry-ext-pymemcache>=0.11b0",
3643
"pymongo": "opentelemetry-ext-pymongo>=0.8b0",
3744
"pymysql": "opentelemetry-ext-pymysql>=0.8b0",
45+
"pyramid": "opentelemetry-ext-pyramid>=0.11b0",
3846
"redis": "opentelemetry-ext-redis>=0.8b0",
47+
"requests": "opentelemetry-ext-requests>=0.8b0",
3948
"sqlalchemy": "opentelemetry-ext-sqlalchemy>=0.8b0",
49+
"sqlite3": "opentelemetry-ext-sqlite3>=0.11b0",
50+
"starlette": "opentelemetry-instrumentation-starlette>=0.11b0",
4051
"wsgi": "opentelemetry-ext-wsgi>=0.8b0",
4152
}
4253

4354
# relevant instrumentors and tracers to uninstall and check for conflicts for target libraries
4455
libraries = {
56+
"asgi": ("opentelemetry-ext-asgi",),
57+
"asyncpg": ("opentelemetry-ext-asyncpg",),
58+
"boto": ("opentelemetry-ext-boto",),
59+
"botocore": ("opentelemetry-ext-botocore",),
60+
"celery": ("opentelemetry-ext-celery",),
4561
"dbapi": ("opentelemetry-ext-dbapi",),
4662
"django": ("opentelemetry-ext-django",),
63+
"elasticsearch": ("opentelemetry-ext-elasticsearch",),
64+
"fastapi": ("opentelemetry-instrumentation-fastapi",),
4765
"flask": ("opentelemetry-ext-flask",),
4866
"grpc": ("opentelemetry-ext-grpc",),
49-
"requests": ("opentelemetry-ext-requests",),
5067
"jinja2": ("opentelemetry-ext-jinja2",),
5168
"mysql": ("opentelemetry-ext-mysql",),
5269
"psycopg2": ("opentelemetry-ext-psycopg2",),
70+
"pymemcache": ("opentelemetry-ext-pymemcache",),
5371
"pymongo": ("opentelemetry-ext-pymongo",),
5472
"pymysql": ("opentelemetry-ext-pymysql",),
73+
"pyramid": ("opentelemetry-ext-pyramid",),
5574
"redis": ("opentelemetry-ext-redis",),
75+
"requests": ("opentelemetry-ext-requests",),
5676
"sqlalchemy": ("opentelemetry-ext-sqlalchemy",),
77+
"sqlite3": ("opentelemetry-ext-sqlite3",),
78+
"starlette": ("opentelemetry-instrumentation-starlette",),
5779
"wsgi": ("opentelemetry-ext-wsgi",),
5880
}
5981

‎tox.ini

+16-16
Original file line numberDiff line numberDiff line change
@@ -202,33 +202,33 @@ changedir =
202202
test-core-getting-started: docs/getting_started/tests
203203
test-core-opentracing-shim: ext/opentelemetry-ext-opentracing-shim/tests
204204

205-
test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
206205
test-instrumentation-aiohttp-client: ext/opentelemetry-ext-aiohttp-client/tests
207-
test-instrumentation-requests: ext/opentelemetry-ext-requests/tests
208-
test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
206+
test-instrumentation-asgi: ext/opentelemetry-ext-asgi/tests
207+
test-instrumentation-asyncpg: ext/opentelemetry-ext-asyncpg/tests
208+
test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
209+
test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
210+
test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
209211
test-instrumentation-dbapi: ext/opentelemetry-ext-dbapi/tests
210212
test-instrumentation-django: ext/opentelemetry-ext-django/tests
213+
test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
214+
test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
215+
test-instrumentation-fastapi: ext/opentelemetry-instrumentation-fastapi/tests
216+
test-instrumentation-flask: ext/opentelemetry-ext-flask/tests
217+
test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
218+
test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
211219
test-instrumentation-mysql: ext/opentelemetry-ext-mysql/tests
220+
test-instrumentation-psycopg2: ext/opentelemetry-ext-psycopg2/tests
212221
test-instrumentation-pymemcache: ext/opentelemetry-ext-pymemcache/tests
213222
test-instrumentation-pymongo: ext/opentelemetry-ext-pymongo/tests
214-
test-instrumentation-psycopg2: ext/opentelemetry-ext-psycopg2/tests
215223
test-instrumentation-pymysql: ext/opentelemetry-ext-pymysql/tests
216224
test-instrumentation-pyramid: ext/opentelemetry-ext-pyramid/tests
217-
test-instrumentation-asgi: ext/opentelemetry-ext-asgi/tests
218-
test-instrumentation-sqlite3: ext/opentelemetry-ext-sqlite3/tests
219-
test-instrumentation-wsgi: ext/opentelemetry-ext-wsgi/tests
220-
test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
221-
test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
222-
test-instrumentation-fastapi: ext/opentelemetry-instrumentation-fastapi/tests
223-
test-instrumentation-flask: ext/opentelemetry-ext-flask/tests
224-
test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
225-
test-instrumentation-sqlalchemy: ext/opentelemetry-ext-sqlalchemy/tests
226225
test-instrumentation-redis: ext/opentelemetry-ext-redis/tests
226+
test-instrumentation-requests: ext/opentelemetry-ext-requests/tests
227+
test-instrumentation-sqlalchemy: ext/opentelemetry-ext-sqlalchemy/tests
228+
test-instrumentation-sqlite3: ext/opentelemetry-ext-sqlite3/tests
227229
test-instrumentation-starlette: ext/opentelemetry-instrumentation-starlette/tests
228230
test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests
229-
test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
230-
test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
231-
test-instrumentation-asyncpg: ext/opentelemetry-ext-asyncpg/tests
231+
test-instrumentation-wsgi: ext/opentelemetry-ext-wsgi/tests
232232

233233
test-exporter-jaeger: ext/opentelemetry-ext-jaeger/tests
234234
test-exporter-datadog: ext/opentelemetry-ext-datadog/tests

0 commit comments

Comments
 (0)