Skip to content

Commit f618b53

Browse files
committed
Remove [test] package from confluent-kafka instrumentation (open-telemetry#2287)
Fixes open-telemetry#2196
1 parent c8889d7 commit f618b53

File tree

5 files changed

+42
-11
lines changed

5 files changed

+42
-11
lines changed

instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ classifiers = [
2121
"Programming Language :: Python :: 3.8",
2222
]
2323
dependencies = [
24+
"opentelemetry-instrumentation == 0.45b0.dev",
2425
"opentelemetry-api ~= 1.12",
2526
"wrapt >= 1.0.0, < 2.0.0",
2627
]
@@ -29,9 +30,6 @@ dependencies = [
2930
instruments = [
3031
"confluent-kafka >= 1.8.2, <= 2.3.0",
3132
]
32-
test = [
33-
"opentelemetry-instrumentation-confluent-kafka[instruments]",
34-
]
3533

3634
[project.entry-points.opentelemetry_instrumentor]
3735
confluent_kafka = "opentelemetry.instrumentation.confluent_kafka:ConfluentKafkaInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
confluent-kafka==2.3.0
4+
Deprecated==1.2.14
5+
importlib-metadata==6.11.0
6+
iniconfig==2.0.0
7+
packaging==23.2
8+
pluggy==1.4.0
9+
py==1.11.0
10+
py-cpuinfo==9.0.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.9.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-confluent-kafka

instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ dependencies = [
3333
instruments = [
3434
"PyMySQL < 2",
3535
]
36-
test = [
37-
"opentelemetry-instrumentation-pymysql[instruments]",
38-
"opentelemetry-test-utils == 0.45b0.dev",
39-
]
4036

4137
[project.entry-points.opentelemetry_instrumentor]
4238
pymysql = "opentelemetry.instrumentation.pymysql:PyMySQLInstrumentor"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
asgiref==3.7.2
2+
attrs==23.2.0
3+
Deprecated==1.2.14
4+
importlib-metadata==6.11.0
5+
iniconfig==2.0.0
6+
packaging==23.2
7+
pluggy==1.4.0
8+
py==1.11.0
9+
py-cpuinfo==9.0.0
10+
PyMySQL==1.1.0
11+
pytest==7.1.3
12+
pytest-benchmark==4.0.0
13+
tomli==2.0.1
14+
typing_extensions==4.9.0
15+
wrapt==1.16.0
16+
zipp==3.17.0
17+
-e opentelemetry-instrumentation
18+
-e instrumentation/opentelemetry-instrumentation-dbapi
19+
-e instrumentation/opentelemetry-instrumentation-pymysql

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ commands_pre =
341341

342342
kafka-python: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
343343

344-
confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
344+
confluent-kafka: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
345345

346346
grpc: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt
347347

@@ -402,7 +402,7 @@ commands_pre =
402402

403403
psycopg2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt
404404

405-
pymysql: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
405+
pymysql: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
406406

407407
pyramid: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt
408408

@@ -590,7 +590,6 @@ commands_pre =
590590
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt
591591
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt
592592
; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt
593-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
594593
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt
595594
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt
596595
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -603,7 +602,8 @@ commands_pre =
603602
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt
604603
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt
605604
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt
606-
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql[test]
605+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt
606+
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt
607607
# prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install
608608
# for your OS to install the required dependencies
609609
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt

0 commit comments

Comments
 (0)