WIP: depends on PR 475

wip wip
open-telemetry · May 27, 2021 · 9b726cb · 9b726cb
1 parent 04a959f
commit 9b726cb
Show file tree

Hide file tree

Showing 35 changed files with 13 additions and 66 deletions.
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.py b/instrumentation/opentelemetry-instrumentation-aiopg/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.py b/instrumentation/opentelemetry-instrumentation-asgi/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.py b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.py b/instrumentation/opentelemetry-instrumentation-boto/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.py b/instrumentation/opentelemetry-instrumentation-botocore/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.py b/instrumentation/opentelemetry-instrumentation-celery/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.py b/instrumentation/opentelemetry-instrumentation-dbapi/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.py b/instrumentation/opentelemetry-instrumentation-django/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.py b/instrumentation/opentelemetry-instrumentation-falcon/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.py b/instrumentation/opentelemetry-instrumentation-fastapi/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.py b/instrumentation/opentelemetry-instrumentation-flask/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.py b/instrumentation/opentelemetry-instrumentation-grpc/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.py b/instrumentation/opentelemetry-instrumentation-jinja2/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.py b/instrumentation/opentelemetry-instrumentation-logging/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.py b/instrumentation/opentelemetry-instrumentation-mysql/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.py b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.py b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.py b/instrumentation/opentelemetry-instrumentation-pymongo/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.py b/instrumentation/opentelemetry-instrumentation-pymysql/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.py b/instrumentation/opentelemetry-instrumentation-pyramid/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.py b/instrumentation/opentelemetry-instrumentation-redis/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.py b/instrumentation/opentelemetry-instrumentation-requests/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.py b/instrumentation/opentelemetry-instrumentation-sklearn/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.py b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.py b/instrumentation/opentelemetry-instrumentation-starlette/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.py b/instrumentation/opentelemetry-instrumentation-tornado/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.py b/instrumentation/opentelemetry-instrumentation-urllib/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.py b/instrumentation/opentelemetry-instrumentation-urllib3/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.py b/instrumentation/opentelemetry-instrumentation-wsgi/setup.py
@@ -17,8 +17,6 @@
 # RUN `python scripts/generate_setup.py` TO REGENERATE.
 
 
-import distutils.cmd
-import json
 import os
 import distutils.cmd
 import json

diff --git a/...tion/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/package.py b/...tion/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/package.py
@@ -13,4 +13,4 @@
 # limitations under the License.
 
 
-_instruments = tuple()
+_instruments = ("wsgiref ~= 0.1.2",)
diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap.py
@@ -105,6 +105,17 @@ def _is_installed(req):
         return False
     return True
 
+    try:
+        pkg_resources.get_distribution(req)
+    except pkg_resources.DistributionNotFound:
+        return False
+    except pkg_resources.VersionConflict as exc:
+        logger.warning(
+            "instrumentation for package %s is available but version %s is installed. Skipping."
+            % (exc.req, exc.dist.as_requirement())
+        )
+        return False
+    return True
 
 def _find_installed_libraries():
     libs = default_instrumentations[:]

diff --git a/templates/instrumentation_setup.py.txt b/templates/instrumentation_setup.py.txt
@@ -81,7 +81,7 @@ class JSONMetadataCommand(distutils.cmd.Command):
 
 
 setuptools.setup(
-    cmdclass={'meta':  JSONMetadataCommand},
+    cmdclass={'meta': JSONMetadataCommand},
     version=PACKAGE_INFO["__version__"],
     extras_require=extras_require
 )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,4 @@
		# limitations under the License.


		_instruments = tuple()
		_instruments = ("wsgiref ~= 0.1.2",)