From 5d82b0aa30725d2d78ffb9f96cd0dd6742b96a96 Mon Sep 17 00:00:00 2001
From: alrex <aboten@lightstep.com>
Date: Wed, 15 Jul 2020 10:18:33 -0700
Subject: [PATCH] chore: update bootstrap with new instrumentations (#913)

---
 .../instrumentation/bootstrap.py              | 26 +++++++++++++--
 tox.ini                                       | 32 +++++++++----------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
index e313ca9631..f624a2e4dd 100644
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
@@ -25,35 +25,57 @@
 
 # target library to desired instrumentor path/versioned package name
 instrumentations = {
+    "asgi": "opentelemetry-ext-asgi>=0.11b0",
+    "asyncpg": "opentelemetry-ext-asyncpg>=0.11b0",
+    "boto": "opentelemetry-ext-boto>=0.11b0",
+    "botocore": "opentelemetry-ext-botocore>=0.11b0",
+    "celery": "opentelemetry-ext-celery>=0.11b0",
     "dbapi": "opentelemetry-ext-dbapi>=0.8b0",
     "django": "opentelemetry-ext-django>=0.8b0",
+    "elasticsearch": "opentelemetry-ext-elasticsearch>=0.11b0",
+    "fastapi": "opentelemetry-instrumentation-fastapi>=0.11b0",
     "flask": "opentelemetry-ext-flask>=0.8b0",
     "grpc": "opentelemetry-ext-grpc>=0.8b0",
-    "requests": "opentelemetry-ext-requests>=0.8b0",
     "jinja2": "opentelemetry-ext-jinja2>=0.8b0",
     "mysql": "opentelemetry-ext-mysql>=0.8b0",
     "psycopg2": "opentelemetry-ext-psycopg2>=0.8b0",
+    "pymemcache": "opentelemetry-ext-pymemcache>=0.11b0",
     "pymongo": "opentelemetry-ext-pymongo>=0.8b0",
     "pymysql": "opentelemetry-ext-pymysql>=0.8b0",
+    "pyramid": "opentelemetry-ext-pyramid>=0.11b0",
     "redis": "opentelemetry-ext-redis>=0.8b0",
+    "requests": "opentelemetry-ext-requests>=0.8b0",
     "sqlalchemy": "opentelemetry-ext-sqlalchemy>=0.8b0",
+    "sqlite3": "opentelemetry-ext-sqlite3>=0.11b0",
+    "starlette": "opentelemetry-instrumentation-starlette>=0.11b0",
     "wsgi": "opentelemetry-ext-wsgi>=0.8b0",
 }
 
 # relevant instrumentors and tracers to uninstall and check for conflicts for target libraries
 libraries = {
+    "asgi": ("opentelemetry-ext-asgi",),
+    "asyncpg": ("opentelemetry-ext-asyncpg",),
+    "boto": ("opentelemetry-ext-boto",),
+    "botocore": ("opentelemetry-ext-botocore",),
+    "celery": ("opentelemetry-ext-celery",),
     "dbapi": ("opentelemetry-ext-dbapi",),
     "django": ("opentelemetry-ext-django",),
+    "elasticsearch": ("opentelemetry-ext-elasticsearch",),
+    "fastapi": ("opentelemetry-instrumentation-fastapi",),
     "flask": ("opentelemetry-ext-flask",),
     "grpc": ("opentelemetry-ext-grpc",),
-    "requests": ("opentelemetry-ext-requests",),
     "jinja2": ("opentelemetry-ext-jinja2",),
     "mysql": ("opentelemetry-ext-mysql",),
     "psycopg2": ("opentelemetry-ext-psycopg2",),
+    "pymemcache": ("opentelemetry-ext-pymemcache",),
     "pymongo": ("opentelemetry-ext-pymongo",),
     "pymysql": ("opentelemetry-ext-pymysql",),
+    "pyramid": ("opentelemetry-ext-pyramid",),
     "redis": ("opentelemetry-ext-redis",),
+    "requests": ("opentelemetry-ext-requests",),
     "sqlalchemy": ("opentelemetry-ext-sqlalchemy",),
+    "sqlite3": ("opentelemetry-ext-sqlite3",),
+    "starlette": ("opentelemetry-instrumentation-starlette",),
     "wsgi": ("opentelemetry-ext-wsgi",),
 }
 
diff --git a/tox.ini b/tox.ini
index 4b9ed90479..ea3a5c2913 100644
--- a/tox.ini
+++ b/tox.ini
@@ -202,33 +202,33 @@ changedir =
   test-core-getting-started: docs/getting_started/tests
   test-core-opentracing-shim: ext/opentelemetry-ext-opentracing-shim/tests
 
-  test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
   test-instrumentation-aiohttp-client: ext/opentelemetry-ext-aiohttp-client/tests
-  test-instrumentation-requests: ext/opentelemetry-ext-requests/tests
-  test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
+  test-instrumentation-asgi: ext/opentelemetry-ext-asgi/tests
+  test-instrumentation-asyncpg: ext/opentelemetry-ext-asyncpg/tests
+  test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
+  test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
+  test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
   test-instrumentation-dbapi: ext/opentelemetry-ext-dbapi/tests
   test-instrumentation-django: ext/opentelemetry-ext-django/tests
+  test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
+  test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
+  test-instrumentation-fastapi: ext/opentelemetry-instrumentation-fastapi/tests
+  test-instrumentation-flask: ext/opentelemetry-ext-flask/tests
+  test-instrumentation-grpc: ext/opentelemetry-ext-grpc/tests
+  test-instrumentation-jinja2: ext/opentelemetry-ext-jinja2/tests
   test-instrumentation-mysql: ext/opentelemetry-ext-mysql/tests
+  test-instrumentation-psycopg2: ext/opentelemetry-ext-psycopg2/tests
   test-instrumentation-pymemcache: ext/opentelemetry-ext-pymemcache/tests
   test-instrumentation-pymongo: ext/opentelemetry-ext-pymongo/tests
-  test-instrumentation-psycopg2: ext/opentelemetry-ext-psycopg2/tests
   test-instrumentation-pymysql: ext/opentelemetry-ext-pymysql/tests
   test-instrumentation-pyramid: ext/opentelemetry-ext-pyramid/tests
-  test-instrumentation-asgi: ext/opentelemetry-ext-asgi/tests
-  test-instrumentation-sqlite3: ext/opentelemetry-ext-sqlite3/tests
-  test-instrumentation-wsgi: ext/opentelemetry-ext-wsgi/tests
-  test-instrumentation-boto: ext/opentelemetry-ext-boto/tests
-  test-instrumentation-botocore: ext/opentelemetry-ext-botocore/tests
-  test-instrumentation-fastapi: ext/opentelemetry-instrumentation-fastapi/tests
-  test-instrumentation-flask: ext/opentelemetry-ext-flask/tests
-  test-instrumentation-example-app: docs/examples/opentelemetry-example-app/tests
-  test-instrumentation-sqlalchemy: ext/opentelemetry-ext-sqlalchemy/tests
   test-instrumentation-redis: ext/opentelemetry-ext-redis/tests
+  test-instrumentation-requests: ext/opentelemetry-ext-requests/tests
+  test-instrumentation-sqlalchemy: ext/opentelemetry-ext-sqlalchemy/tests
+  test-instrumentation-sqlite3: ext/opentelemetry-ext-sqlite3/tests
   test-instrumentation-starlette: ext/opentelemetry-instrumentation-starlette/tests
   test-instrumentation-system-metrics: ext/opentelemetry-ext-system-metrics/tests
-  test-instrumentation-celery: ext/opentelemetry-ext-celery/tests
-  test-instrumentation-elasticsearch{2,5,6,7}: ext/opentelemetry-ext-elasticsearch/tests
-  test-instrumentation-asyncpg: ext/opentelemetry-ext-asyncpg/tests
+  test-instrumentation-wsgi: ext/opentelemetry-ext-wsgi/tests
 
   test-exporter-jaeger: ext/opentelemetry-ext-jaeger/tests
   test-exporter-datadog: ext/opentelemetry-ext-datadog/tests