Skip to content

Remove [test] package from sqlalchemy instrumentation #2315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Remove [test] package from sqlalchemy instrumentation #2315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b782d38
Remove [test] package from sqlalchemy instrumentation
ocelotl Feb 28, 2024
39cedc9
Merge branch 'main' into issue_2219
shalevr Mar 16, 2024
306e43e
Merge branch 'main' into issue_2219
ocelotl Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ dependencies = [
instruments = [
"sqlalchemy",
]
test = [
"opentelemetry-instrumentation-sqlalchemy[instruments]",
"opentelemetry-sdk ~= 1.12",
"pytest",
]

[project.entry-points.opentelemetry_instrumentor]
sqlalchemy = "opentelemetry.instrumentation.sqlalchemy:SQLAlchemyInstrumentor"
Expand Down
22 changes: 22 additions & 0 deletions instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
asgiref==3.7.2
attrs==23.2.0
cffi==1.15.1
Deprecated==1.2.14
greenlet==0.4.13
hpy==0.0.4.dev179+g9b5d200
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
readline==6.2.4.1
SQLAlchemy==1.1.18
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-sqlalchemy
20 changes: 20 additions & 0 deletions instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
aiosqlite==0.20.0
asgiref==3.7.2
attrs==23.2.0
Deprecated==1.2.14
greenlet==3.0.3
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==23.2
pluggy==1.4.0
py==1.11.0
py-cpuinfo==9.0.0
pytest==7.1.3
pytest-benchmark==4.0.0
SQLAlchemy==1.4.51
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-sqlalchemy
16 changes: 9 additions & 7 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,12 @@ envlist =
pypy3-test-instrumentation-grpc

; opentelemetry-instrumentation-sqlalchemy
py3{8,9,10,11}-test-instrumentation-sqlalchemy-{14}
pypy3-test-instrumentation-sqlalchemy-{11,14}
; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: sqlalchemy>=1.1,<1.2
; 1: sqlalchemy~=1.4 aiosqlite
py3{8,9,10,11}-test-instrumentation-sqlalchemy-{1}
pypy3-test-instrumentation-sqlalchemy-{0,1}

; opentelemetry-instrumentation-redis
py3{8,9,10,11}-test-instrumentation-redis
Expand Down Expand Up @@ -296,9 +300,6 @@ deps =
coverage: pytest
coverage: pytest-cov
grpc: pytest-asyncio
sqlalchemy-11: sqlalchemy>=1.1,<1.2
sqlalchemy-14: aiosqlite
sqlalchemy-14: sqlalchemy~=1.4
sio-pika-0: pika>=0.12.0,<1.0.0
sio-pika-1: pika>=1.0.0

Expand Down Expand Up @@ -434,7 +435,8 @@ commands_pre =

sklearn: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn[test]

sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
sqlalchemy-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-0.txt
sqlalchemy-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt

elasticsearch-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-0.txt
elasticsearch-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt
Expand Down Expand Up @@ -572,7 +574,7 @@ commands_pre =
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-boto[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
Expand Down