Skip to content
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

Jump to bottom

Remove [test] package from elasticsearch configuration #2312

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Remove [test] package from elasticsearch configuration #2312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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-elasticsearch/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ dependencies = [
instruments = [
"elasticsearch >= 2.0",
]
test = [
"opentelemetry-instrumentation-elasticsearch[instruments]",
"elasticsearch-dsl >= 2.0",
"opentelemetry-test-utils == 0.45b0.dev",
]

[project.entry-points.opentelemetry_instrumentor]
elasticsearch = "opentelemetry.instrumentation.elasticsearch:ElasticsearchInstrumentor"
Expand Down
22 changes: 22 additions & 0 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/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
Deprecated==1.2.14
elasticsearch==2.4.1
elasticsearch-dsl==2.2.0
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
python-dateutil==2.8.2
six==1.16.0
tomli==2.0.1
typing_extensions==4.10.0
urllib3==1.26.18
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-elasticsearch
22 changes: 22 additions & 0 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.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
Deprecated==1.2.14
elasticsearch==5.5.3
elasticsearch-dsl==5.4.0
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
python-dateutil==2.8.2
six==1.16.0
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-elasticsearch
22 changes: 22 additions & 0 deletions instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.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
Deprecated==1.2.14
elasticsearch==6.8.2
elasticsearch-dsl==6.4.0
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
python-dateutil==2.8.2
six==1.16.0
tomli==2.0.1
typing_extensions==4.10.0
urllib3==2.2.1
wrapt==1.16.0
zipp==3.17.0
-e opentelemetry-instrumentation
-e instrumentation/opentelemetry-instrumentation-elasticsearch
31 changes: 14 additions & 17 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,16 @@ envlist =
; pypy3-test-instrumentation-boto

; opentelemetry-instrumentation-elasticsearch
py3{8,9,10,11}-test-instrumentation-elasticsearch-{2,6}
pypy3-test-instrumentation-elasticsearch-{2,6}
py3{8,9}-test-instrumentation-elasticsearch-5
pypy3-test-instrumentation-elasticsearch-5
; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620
; The numbers at the end of the environment names
; below mean these dependencies are being used:
; 0: elasticsearch-dsl>=2.0,<3.0 elasticsearch>=2.0,<3.0
; 1: elasticsearch-dsl>=5.0,<6.0 elasticsearch>=5.0,<6.0
; 2: elasticsearch-dsl>=6.0,<7.0 elasticsearch>=6.0,<7.0
py3{8,9,10,11}-test-instrumentation-elasticsearch-{0,2}
pypy3-test-instrumentation-elasticsearch-{0,2}
py3{8,9}-test-instrumentation-elasticsearch-1
pypy3-test-instrumentation-elasticsearch-1

; opentelemetry-instrumentation-falcon
; py310 does not work with falcon 1
Expand Down Expand Up @@ -289,17 +295,6 @@ deps =
test: pytest-benchmark
coverage: pytest
coverage: pytest-cov
elasticsearch-2: elasticsearch-dsl>=2.0,<3.0
elasticsearch-2: elasticsearch>=2.0,<3.0
elasticsearch-5: elasticsearch-dsl>=5.0,<6.0
elasticsearch-5: elasticsearch>=5.0,<6.0
elasticsearch-6: elasticsearch-dsl>=6.0,<7.0
elasticsearch-6: elasticsearch>=6.0,<7.0
; FIXME: Elasticsearch >=7 causes CI workflow tests to hang, see open-telemetry/opentelemetry-python-contrib#620
; elasticsearch-7: elasticsearch-dsl>=7.0,<8.0
; elasticsearch-7: elasticsearch>=7.0,<8.0
; elasticsearch-8: elasticsearch-dsl>=8.0,<9.0
; elasticsearch-8: elasticsearch>=8.0,<9.0
grpc: pytest-asyncio
sqlalchemy-11: sqlalchemy>=1.1,<1.2
sqlalchemy-14: aiosqlite
Expand Down Expand Up @@ -441,7 +436,9 @@ commands_pre =

sqlalchemy-{11,14}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy[test]

elasticsearch-{2,5,6}: pip install {toxinidir}/opentelemetry-instrumentation[test] {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
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
elasticsearch-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt

asyncio: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt

Expand Down Expand Up @@ -604,7 +601,7 @@ commands_pre =
# for your OS to install the required dependencies
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo[test]
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-2.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg[test]
pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt
python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm[test]
Expand Down
Loading