Add missing fixes for several test envs

Author: ocelotl

.github/workflows/instrumentations_0.yml

@@ -57,7 +57,7 @@ jobs:
           - "logging"
           - "mysql"
           - "mysqlclient"
-          - "pika"
+          - "sio-pika"
           - "psycopg2"
           - "pymemcache"
           - "pymongo"

.github/workflows/instrumentations_1.yml

@@ -26,7 +26,7 @@ jobs:
         python-version: [py37, py38, py39, py310, py311, pypy3]
         package:
           - "urllib"
-          - "urllib3"
+          - "urllib3v"
           - "wsgi"
           - "distro"
           - "richconsole"

tox.ini

@@ -22,9 +22,6 @@ envlist =
     py3{7,8,9,10,11}-test-opentelemetry-instrumentation
     pypy3-test-opentelemetry-instrumentation
 
-    py3{7,8,9,10,11}-test-instrumentation-aio-pika
-    pypy3-test-instrumentation-aio-pika
-
     ; opentelemetry-instrumentation-aiohttp-client
     py3{7,8,9,10,11}-test-instrumentation-aiohttp-client
     pypy3-test-instrumentation-aiohttp-client
@@ -54,10 +51,10 @@ envlist =
     ; Only officially supported Python versions are tested for each Django
     ; major release. Updated list can be found at:
     ; https://docs.djangoproject.com/en/dev/faq/install/#what-python-version-can-i-use-with-django
-    py3{7}-test-instrumentation-django1
-    py3{7,8,9}-test-instrumentation-django2
-    py3{7,8,9,10,11}-test-instrumentation-django3
-    py3{8,9,10,11}-test-instrumentation-django4
+    py3{7}-test-instrumentation-django-1
+    py3{7,8,9}-test-instrumentation-django-2
+    py3{7,8,9,10,11}-test-instrumentation-django-3
+    py3{8,9,10,11}-test-instrumentation-django-4
     pypy3-test-instrumentation-django-{1,2,3}
 
     ; opentelemetry-instrumentation-dbapi
@@ -72,14 +69,12 @@ envlist =
     ; opentelemetry-instrumentation-elasticsearch
     py3{7,8,9,10,11}-test-instrumentation-elasticsearch-{2,6}
     pypy3-test-instrumentation-elasticsearch-{2,6}
-
-    ; opentelemetry-instrumentation-elasticsearch5
-    py3{7,8,9}-test-instrumentation-elasticsearch5
-    pypy3-test-instrumentation-elasticsearch5
+    py3{7,8,9}-test-instrumentation-elasticsearch-5
+    pypy3-test-instrumentation-elasticsearch-5
 
     ; opentelemetry-instrumentation-falcon
     ; py310 does not work with falcon 1
-    py3{7,8,9}-test-instrumentation-falcon1
+    py3{7,8,9}-test-instrumentation-falcon-1
     py3{7,8,9,10,11}-test-instrumentation-falcon-{2,3}
     pypy3-test-instrumentation-falcon-{1,2,3}
 
@@ -104,7 +99,7 @@ envlist =
     py3{7,8,9,10,11}-test-instrumentation-requests
     ;pypy3-test-instrumentation-requests
 
-    ; opentelemetry-instrumentation-starlette.
+    ; opentelemetry-instrumentation-starlette
     py3{7,8,9,10,11}-test-instrumentation-starlette
     pypy3-test-instrumentation-starlette
 
@@ -221,9 +216,9 @@ envlist =
     py3{7,8,9,10,11}-test-propagator-ot-trace
     pypy3-test-propagator-ot-trace
 
-    ; opentelemetry-instrumentation-pika
-    py3{7,8,9,10,11}-test-instrumentation-pika-{0,1}
-    pypy3-test-instrumentation-pika-{0,1}
+    ; opentelemetry-instrumentation-sio-pika
+    py3{7,8,9,10,11}-test-instrumentation-sio-pika-{0,1}
+    pypy3-test-instrumentation-sio-pika-{0,1}
 
     ; opentelemetry-instrumentation-aio-pika
     py3{7,8,9,10,11}-test-instrumentation-aio-pika-{7,8,9}
@@ -259,46 +254,46 @@ deps =
   django2: django~=2.0
   django3: django~=3.0
   django4: django>=4.0b1,<5.0
-  elasticsearch2: elasticsearch-dsl>=2.0,<3.0
-  elasticsearch2: elasticsearch>=2.0,<3.0
-  elasticsearch5: elasticsearch-dsl>=5.0,<6.0
-  elasticsearch5: elasticsearch>=5.0,<6.0
-  elasticsearch6: elasticsearch-dsl>=6.0,<7.0
-  elasticsearch6: elasticsearch>=6.0,<7.0
+  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
-  ; elasticsearch7: elasticsearch-dsl>=7.0,<8.0
-  ; elasticsearch7: elasticsearch>=7.0,<8.0
-  ; elasticsearch8: elasticsearch-dsl>=8.0,<9.0
-  ; elasticsearch8: elasticsearch>=8.0,<9.0
-  falcon1: falcon ==1.4.1
-  falcon2: falcon >=2.0.0,<3.0.0
-  falcon3: falcon >=3.0.0,<4.0.0
-  flask213: Flask ==2.1.3
-  flask213: Werkzeug <3.0.0
-  flask220: Flask ==2.2.0
-  flask220: Werkzeug <3.0.0
-  flask300: Flask >=3.0.0
-  flask300: Werkzeug >=3.0.0
+  ; 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
+  falcon-1: falcon ==1.4.1
+  falcon-2: falcon >=2.0.0,<3.0.0
+  falcon-3: falcon >=3.0.0,<4.0.0
+  flask-213: Flask ==2.1.3
+  flask-213: Werkzeug <3.0.0
+  flask-220: Flask ==2.2.0
+  flask-220: Werkzeug <3.0.0
+  flask-300: Flask >=3.0.0
+  flask-300: Werkzeug >=3.0.0
   grpc: pytest-asyncio
-  sqlalchemy11: sqlalchemy>=1.1,<1.2
-  sqlalchemy14: aiosqlite
-  sqlalchemy14: sqlalchemy~=1.4
-  pika0: pika>=0.12.0,<1.0.0
-  pika1: pika>=1.0.0
+  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
   aio-pika-7: aio_pika~=7.2.0
   aio-pika-8: aio_pika>=8.0.0,<9.0.0
   aio-pika-9: aio_pika>=9.0.0,<10.0.0
-  pymemcache135: pymemcache ==1.3.5
-  pymemcache200: pymemcache >2.0.0,<3.0.0
-  pymemcache300: pymemcache >3.0.0,<3.4.2
-  pymemcache342: pymemcache ==3.4.2
-  pymemcache400: pymemcache ==4.0.0
-  httpx18: httpx>=0.18.0,<0.19.0
-  httpx18: respx~=0.17.0
-  httpx21: httpx>=0.19.0
-  httpx21: respx~=0.20.1
-  urllib3v1: urllib3 >=1.0.0,<2.0.0
-  urllib3v2: urllib3 >=2.0.0,<3.0.0
+  pymemcache-135: pymemcache ==1.3.5
+  pymemcache-200: pymemcache >2.0.0,<3.0.0
+  pymemcache-300: pymemcache >3.0.0,<3.4.2
+  pymemcache-342: pymemcache ==3.4.2
+  pymemcache-400: pymemcache ==4.0.0
+  httpx-18: httpx>=0.18.0,<0.19.0
+  httpx-18: respx~=0.17.0
+  httpx-21: httpx>=0.19.0
+  httpx-21: respx~=0.20.1
+  urllib3v-1: urllib3 >=1.0.0,<2.0.0
+  urllib3v-2: urllib3 >=2.0.0,<3.0.0
 
   ; FIXME: add coverage testing
   ; FIXME: add mypy testing
@@ -312,7 +307,6 @@ setenv =
 changedir =
   test-distro: opentelemetry-distro/tests
   test-opentelemetry-instrumentation: opentelemetry-instrumentation/tests
-  test-instrumentation-aio-pika: instrumentation/opentelemetry-instrumentation-aio-pika/tests
   test-instrumentation-aiohttp-client: instrumentation/opentelemetry-instrumentation-aiohttp-client/tests
   test-instrumentation-aiohttp-server: instrumentation/opentelemetry-instrumentation-aiohttp-server/tests
   test-instrumentation-aiopg: instrumentation/opentelemetry-instrumentation-aiopg/tests
@@ -339,7 +333,7 @@ changedir =
   test-instrumentation-logging: instrumentation/opentelemetry-instrumentation-logging/tests
   test-instrumentation-mysql: instrumentation/opentelemetry-instrumentation-mysql/tests
   test-instrumentation-mysqlclient: instrumentation/opentelemetry-instrumentation-mysqlclient/tests
-  test-instrumentation-pika-{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
+  test-instrumentation-sio-pika-{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
   test-instrumentation-aio-pika-{7,8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
   test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
   test-instrumentation-pymemcache-{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
@@ -381,17 +375,17 @@ commands_pre =
 
   celery: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-celery[test]
 
-  pika{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
+  sio-pika-{0,1}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-pika[test]
 
-  aio-pika{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
+  aio-pika-{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
 
   kafka-python: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python[test]
 
   confluent-kafka: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka[test]
 
   grpc: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc[test]
 
-  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http[test]
+  falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid,tornado,starlette,fastapi,aiohttp,asgi,httpx-{18,21},requests,urllib,urllib3v-{1,2},wsgi: pip install {toxinidir}/util/opentelemetry-util-http
   wsgi,falcon-{1,2,3},flask-{213,220,300},django-{1,2,3,4},pyramid: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
   asgi,django-{3,4},starlette,fastapi: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi[test]
 
@@ -456,7 +450,7 @@ commands_pre =
 
   logging: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-logging[test]
 
-  aio-pika: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
+  aio-pika-{7,8,9}: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika[test]
 
   aiohttp-client: pip install {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client[test]
 
@@ -480,7 +474,7 @@ commands_pre =
 
   resource-detector-container: pip install {toxinidir}/resource/opentelemetry-resource-detector-container[test]
 
-  http: pip install {toxinidir}/util/opentelemetry-util-http[test]
+  http: pip install {toxinidir}/util/opentelemetry-util-http
 ; In order to get a health coverage report,
   propagator-ot-trace: pip install {toxinidir}/propagator/opentelemetry-propagator-ot-trace[test]
 
@@ -531,7 +525,7 @@ commands_pre =
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions"
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"
   python -m pip install "{env:CORE_REPO}#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils"
-  python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test]
+  python -m pip install -e {toxinidir}/util/opentelemetry-util-http
   python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi[test]
   python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi[test]