Remove pkg resources (#2871)

open-telemetry · Oct 19, 2024 · e4ece57 · e4ece57
1 parent d7d7e96
commit e4ece57
Show file tree

Hide file tree

Showing 101 changed files with 245 additions and 260 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,12 +25,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-instrumentation-aiokafka` Wrap `AIOKafkaConsumer.getone()` instead of `AIOKafkaConsumer.__anext__`
   ([#2874](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2874))
 
+### Breaking changes
+
+- Deprecation of pkg_resource in favor of importlib.metadata
+  ([#2871](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2871))
+
 ## Version 1.27.0/0.48b0 (2024-08-28)
 
 ### Added
 
-- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
-  inside kafka-python's instrumentation
+- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng inside kafka-python's instrumentation
   ([#2537](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2537))
 - `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi` Add ability to disable internal HTTP send and receive spans
   ([#2802](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2802))

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -6,7 +6,6 @@ cramjam==2.1.0; platform_python_implementation == "PyPy"
 cramjam==2.8.1; platform_python_implementation != "PyPy"
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 flaky==3.7.0
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 markdown-it-py==3.0.0
 mdurl==0.1.2

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -3,7 +3,6 @@ aiormq==6.2.3
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -3,7 +3,6 @@ aiormq==6.6.4
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -3,7 +3,6 @@ aiormq==6.7.1
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt
@@ -3,7 +3,6 @@ aiormq==6.8.0
 asgiref==3.8.1
 Deprecated==1.2.14
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -11,7 +11,6 @@ Flask==3.0.2
 frozenlist==1.4.1
 http_server_mock==1.7
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 itsdangerous==2.1.2
 Jinja2==3.1.4

diff --git a/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py b/...ion/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py
@@ -24,7 +24,6 @@
 import aiohttp.test_utils
 import yarl
 from http_server_mock import HttpServerMock
-from pkg_resources import iter_entry_points
 
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation import aiohttp_client
@@ -47,6 +46,7 @@
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import Span, StatusCode
+from opentelemetry.util._importlib_metadata import entry_points
 
 
 def run_with_test_server(
@@ -886,9 +886,9 @@ def response_hook(
 
 class TestLoadingAioHttpInstrumentor(unittest.TestCase):
     def test_loading_instrumentor(self):
-        entry_points = iter_entry_points(
-            "opentelemetry_instrumentor", "aiohttp-client"
+        (entry_point,) = entry_points(
+            group="opentelemetry_instrumentor", name="aiohttp-client"
         )
 
-        instrumentor = next(entry_points).load()()
+        instrumentor = entry_point.load()()
         self.assertIsInstance(instrumentor, AioHttpClientInstrumentor)
diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -5,7 +5,6 @@ async-timeout==4.0.3
 Deprecated==1.2.14
 frozenlist==1.4.1
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
@@ -2,7 +2,6 @@ aiopg==1.4.0
 asgiref==3.8.1
 async-timeout==4.0.3
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.8.1
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.8.1
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
@@ -2,7 +2,6 @@ asgiref==3.8.1
 async-timeout==4.0.3
 asyncpg==0.29.0
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.8.1
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
@@ -9,7 +9,6 @@ cryptography==43.0.1
 Deprecated==1.2.14
 docker==7.0.0
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 Jinja2==3.1.4
 jmespath==1.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
@@ -2,7 +2,6 @@ asgiref==3.8.1
 boto3==1.34.44
 botocore==1.34.44
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 jmespath==1.0.1
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
@@ -9,7 +9,6 @@ cryptography==43.0.1
 Deprecated==1.2.14
 docker==7.0.0
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 Jinja2==3.1.4
 jmespath==1.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt
@@ -4,7 +4,6 @@ pyasyncore==1.0.4  # for python 3.13 (should removed when cassandra-driver repla
 click==8.1.7
 Deprecated==1.2.14
 geomet==0.2.1.post1
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt
@@ -8,7 +8,6 @@ click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.3.0
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 kombu==5.3.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt
@@ -7,7 +7,6 @@ click-didyoumean==0.3.0
 click-plugins==1.1.1
 click-repl==0.3.0
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 kombu==5.3.5
 packaging==24.0

diff --git a/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 confluent-kafka==2.4.0
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt
@@ -1,6 +1,5 @@
 asgiref==3.8.1
 Deprecated==1.2.14
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 Django==2.2.28
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 Django==3.2.25
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt
@@ -2,7 +2,6 @@ asgiref==3.8.1
 backports.zoneinfo==0.2.1
 Deprecated==1.2.14
 Django==4.2.15
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 Django==4.2.15
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
@@ -2,7 +2,6 @@ asgiref==3.8.1
 Deprecated==1.2.14
 elasticsearch==6.8.2
 elasticsearch-dsl==6.4.0
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
@@ -2,7 +2,6 @@ asgiref==3.8.1
 Deprecated==1.2.14
 elasticsearch==7.17.9
 elasticsearch-dsl==7.4.1
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
@@ -3,7 +3,6 @@ Deprecated==1.2.14
 elasticsearch==8.13.1
 elasticsearch-dsl==8.13.1
 elastic-transport==8.13.0
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 falcon==1.4.1
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 falcon==2.0.0
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
@@ -1,7 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
 falcon==3.1.1
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt
@@ -10,7 +10,6 @@ h11==0.14.0
 httpcore==1.0.4
 httpx==0.27.0
 idna==3.7
-importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0