Skip to content

Commit e4ece57

Browse files
xrmxxrmx
authored
Remove pkg resources (#2871)
1 parent d7d7e96 commit e4ece57

File tree

101 files changed

+245
-260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+245
-260
lines changed

‎CHANGELOG.md

+6-2
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2525
- `opentelemetry-instrumentation-aiokafka` Wrap `AIOKafkaConsumer.getone()` instead of `AIOKafkaConsumer.__anext__`
2626
([#2874](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2874))
2727

28+
### Breaking changes
29+
30+
- Deprecation of pkg_resource in favor of importlib.metadata
31+
([#2871](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2871))
32+
2833
## Version 1.27.0/0.48b0 (2024-08-28)
2934

3035
### Added
3136

32-
- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng
33-
inside kafka-python's instrumentation
37+
- `opentelemetry-instrumentation-kafka-python` Instrument temporary fork, kafka-python-ng inside kafka-python's instrumentation
3438
([#2537](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2537))
3539
- `opentelemetry-instrumentation-asgi`, `opentelemetry-instrumentation-fastapi` Add ability to disable internal HTTP send and receive spans
3640
([#2802](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2802))

‎exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ cramjam==2.1.0; platform_python_implementation == "PyPy"
66
cramjam==2.8.1; platform_python_implementation != "PyPy"
77
Deprecated==1.2.14
88
idna==3.7
9-
importlib-metadata==6.11.0
109
iniconfig==2.0.0
1110
packaging==24.0
1211
pluggy==1.5.0

‎exporter/opentelemetry-exporter-richconsole/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
flaky==3.7.0
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
markdown-it-py==3.0.0
76
mdurl==0.1.2

‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ aiormq==6.2.3
33
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
6-
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
multidict==6.0.5
98
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ aiormq==6.6.4
33
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
6-
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
multidict==6.0.5
98
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ aiormq==6.7.1
33
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
6-
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
multidict==6.0.5
98
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ aiormq==6.8.0
33
asgiref==3.8.1
44
Deprecated==1.2.14
55
idna==3.7
6-
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
multidict==6.0.5
98
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Flask==3.0.2
1111
frozenlist==1.4.1
1212
http_server_mock==1.7
1313
idna==3.7
14-
importlib-metadata==6.11.0
1514
iniconfig==2.0.0
1615
itsdangerous==2.1.2
1716
Jinja2==3.1.4

‎instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import aiohttp.test_utils
2525
import yarl
2626
from http_server_mock import HttpServerMock
27-
from pkg_resources import iter_entry_points
2827

2928
from opentelemetry import trace as trace_api
3029
from opentelemetry.instrumentation import aiohttp_client
@@ -47,6 +46,7 @@
4746
from opentelemetry.semconv.trace import SpanAttributes
4847
from opentelemetry.test.test_base import TestBase
4948
from opentelemetry.trace import Span, StatusCode
49+
from opentelemetry.util._importlib_metadata import entry_points
5050

5151

5252
def run_with_test_server(
@@ -886,9 +886,9 @@ def response_hook(
886886

887887
class TestLoadingAioHttpInstrumentor(unittest.TestCase):
888888
def test_loading_instrumentor(self):
889-
entry_points = iter_entry_points(
890-
"opentelemetry_instrumentor", "aiohttp-client"
889+
(entry_point,) = entry_points(
890+
group="opentelemetry_instrumentor", name="aiohttp-client"
891891
)
892892

893-
instrumentor = next(entry_points).load()()
893+
instrumentor = entry_point.load()()
894894
self.assertIsInstance(instrumentor, AioHttpClientInstrumentor)

‎instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ async-timeout==4.0.3
55
Deprecated==1.2.14
66
frozenlist==1.4.1
77
idna==3.7
8-
importlib-metadata==6.11.0
98
iniconfig==2.0.0
109
multidict==6.0.5
1110
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ aiopg==1.4.0
22
asgiref==3.8.1
33
async-timeout==4.0.3
44
Deprecated==1.2.14
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
packaging==24.0
87
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
3-
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0
65
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
3-
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0
65
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ asgiref==3.8.1
22
async-timeout==4.0.3
33
asyncpg==0.29.0
44
Deprecated==1.2.14
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
packaging==24.0
87
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
3-
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0
65
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cryptography==43.0.1
99
Deprecated==1.2.14
1010
docker==7.0.0
1111
idna==3.7
12-
importlib-metadata==6.11.0
1312
iniconfig==2.0.0
1413
Jinja2==3.1.4
1514
jmespath==1.0.1

‎instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ asgiref==3.8.1
22
boto3==1.34.44
33
botocore==1.34.44
44
Deprecated==1.2.14
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
jmespath==1.0.1
87
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ cryptography==43.0.1
99
Deprecated==1.2.14
1010
docker==7.0.0
1111
idna==3.7
12-
importlib-metadata==6.11.0
1312
iniconfig==2.0.0
1413
Jinja2==3.1.4
1514
jmespath==1.0.1

‎instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ pyasyncore==1.0.4 # for python 3.13 (should removed when cassandra-driver repla
44
click==8.1.7
55
Deprecated==1.2.14
66
geomet==0.2.1.post1
7-
importlib-metadata==6.11.0
87
iniconfig==2.0.0
98
packaging==24.0
109
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ click-didyoumean==0.3.0
88
click-plugins==1.1.1
99
click-repl==0.3.0
1010
Deprecated==1.2.14
11-
importlib-metadata==6.11.0
1211
iniconfig==2.0.0
1312
kombu==5.3.5
1413
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ click-didyoumean==0.3.0
77
click-plugins==1.1.1
88
click-repl==0.3.0
99
Deprecated==1.2.14
10-
importlib-metadata==6.11.0
1110
iniconfig==2.0.0
1211
kombu==5.3.5
1312
packaging==24.0

‎instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
confluent-kafka==2.4.0
33
Deprecated==1.2.14
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
3-
importlib-metadata==6.11.0
43
iniconfig==2.0.0
54
packaging==24.0
65
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==2.2.28
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==3.2.25
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ asgiref==3.8.1
22
backports.zoneinfo==0.2.1
33
Deprecated==1.2.14
44
Django==4.2.15
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
packaging==24.0
87
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
Django==4.2.15
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ asgiref==3.8.1
22
Deprecated==1.2.14
33
elasticsearch==6.8.2
44
elasticsearch-dsl==6.4.0
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
packaging==24.0
87
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ asgiref==3.8.1
22
Deprecated==1.2.14
33
elasticsearch==7.17.9
44
elasticsearch-dsl==7.4.1
5-
importlib-metadata==6.11.0
65
iniconfig==2.0.0
76
packaging==24.0
87
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Deprecated==1.2.14
33
elasticsearch==8.13.1
44
elasticsearch-dsl==8.13.1
55
elastic-transport==8.13.0
6-
importlib-metadata==6.11.0
76
iniconfig==2.0.0
87
packaging==24.0
98
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==1.4.1
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==2.0.0
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
asgiref==3.8.1
22
Deprecated==1.2.14
33
falcon==3.1.1
4-
importlib-metadata==6.11.0
54
iniconfig==2.0.0
65
packaging==24.0
76
pluggy==1.5.0

‎instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ h11==0.14.0
1010
httpcore==1.0.4
1111
httpx==0.27.0
1212
idna==3.7
13-
importlib-metadata==6.11.0
1413
iniconfig==2.0.0
1514
packaging==24.0
1615
pluggy==1.5.0

0 commit comments

Comments
 (0)