Merge branch 'main' into psycopg3-instrumentation

Author: reiktar

tox.ini

@@ -308,64 +308,6 @@ setenv =
   CORE_REPO_SHA={env:CORE_REPO_SHA:main}
   CORE_REPO=git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}
 
-changedir =
-  test-distro: opentelemetry-distro/tests
-  test-opentelemetry-instrumentation: opentelemetry-instrumentation/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
-  test-instrumentation-asgi: instrumentation/opentelemetry-instrumentation-asgi/tests
-  test-instrumentation-asyncpg: instrumentation/opentelemetry-instrumentation-asyncpg/tests
-  test-instrumentation-aws-lambda: instrumentation/opentelemetry-instrumentation-aws-lambda/tests
-  test-instrumentation-boto: instrumentation/opentelemetry-instrumentation-boto/tests
-  test-instrumentation-botocore: instrumentation/opentelemetry-instrumentation-botocore/tests
-  test-instrumentation-boto3sqs: instrumentation/opentelemetry-instrumentation-boto3sqs/tests
-  test-instrumentation-cassandra: instrumentation/opentelemetry-instrumentation-cassandra/tests
-  test-instrumentation-celery: instrumentation/opentelemetry-instrumentation-celery/tests
-  test-instrumentation-dbapi: instrumentation/opentelemetry-instrumentation-dbapi/tests
-  test-instrumentation-django-{1,2,3,4}: instrumentation/opentelemetry-instrumentation-django/tests
-  test-instrumentation-elasticsearch-{2,5,6}: instrumentation/opentelemetry-instrumentation-elasticsearch/tests
-  test-instrumentation-falcon-{1,2,3}: instrumentation/opentelemetry-instrumentation-falcon/tests
-  test-instrumentation-fastapi: instrumentation/opentelemetry-instrumentation-fastapi/tests
-  test-instrumentation-flask-{213,220,300}: instrumentation/opentelemetry-instrumentation-flask/tests
-  test-instrumentation-urllib: instrumentation/opentelemetry-instrumentation-urllib/tests
-  test-instrumentation-urllib3v-{1,2}: instrumentation/opentelemetry-instrumentation-urllib3/tests
-  test-instrumentation-grpc: instrumentation/opentelemetry-instrumentation-grpc/tests
-  test-instrumentation-jinja2: instrumentation/opentelemetry-instrumentation-jinja2/tests
-  test-instrumentation-kafka-python: instrumentation/opentelemetry-instrumentation-kafka-python/tests
-  test-instrumentation-confluent-kafka: instrumentation/opentelemetry-instrumentation-confluent-kafka/tests
-  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-sio-pika-{0,1}: instrumentation/opentelemetry-instrumentation-pika/tests
-  test-instrumentation-aio-pika-{8,9}: instrumentation/opentelemetry-instrumentation-aio-pika/tests
-  test-instrumentation-psycopg: instrumentation/opentelemetry-instrumentation-psycopg/tests
-  test-instrumentation-psycopg2: instrumentation/opentelemetry-instrumentation-psycopg2/tests
-  test-instrumentation-pymemcache-{135,200,300,342,400}: instrumentation/opentelemetry-instrumentation-pymemcache/tests
-  test-instrumentation-pymongo: instrumentation/opentelemetry-instrumentation-pymongo/tests
-  test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
-  test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
-  test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
-  test-instrumentation-remoulade: instrumentation/opentelemetry-instrumentation-remoulade/tests
-  test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
-  test-instrumentation-sklearn: instrumentation/opentelemetry-instrumentation-sklearn/tests
-  test-instrumentation-sqlalchemy-{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests
-  test-instrumentation-sqlite3: instrumentation/opentelemetry-instrumentation-sqlite3/tests
-  test-instrumentation-starlette: instrumentation/opentelemetry-instrumentation-starlette/tests
-  test-instrumentation-system-metrics: instrumentation/opentelemetry-instrumentation-system-metrics/tests
-  test-instrumentation-tornado: instrumentation/opentelemetry-instrumentation-tornado/tests
-  test-instrumentation-tortoiseorm: instrumentation/opentelemetry-instrumentation-tortoiseorm/tests
-  test-instrumentation-wsgi: instrumentation/opentelemetry-instrumentation-wsgi/tests
-  test-instrumentation-httpx-{18,21}: instrumentation/opentelemetry-instrumentation-httpx/tests
-  test-instrumentation-asyncio: instrumentation/opentelemetry-instrumentation-asyncio/tests
-  test-util-http: util/opentelemetry-util-http/tests
-  test-sdkextension-aws: sdk-extension/opentelemetry-sdk-extension-aws/tests
-  test-resource-detector-container: resource/opentelemetry-resource-detector-container/tests
-  test-propagator-aws: propagator/opentelemetry-propagator-aws-xray/tests
-  test-propagator-ot-trace: propagator/opentelemetry-propagator-ot-trace/tests
-  test-exporter-richconsole: exporter/opentelemetry-exporter-richconsole/tests
-  test-exporter-prometheus-remote-write: exporter/opentelemetry-exporter-prometheus-remote-write/tests
-
 commands_pre =
 ; Install without -e to test the actual installation
   py3{8,9,10,11}: python -m pip install -U pip setuptools wheel
@@ -494,7 +436,62 @@ commands_pre =
   coverage: python {toxinidir}/scripts/eachdist.py install --editable
 
 commands =
-  test: pytest {posargs}
+  test-distro: pytest {toxinidir}/opentelemetry-distro/tests {posargs}
+  test-opentelemetry-instrumentation: pytest {toxinidir}/opentelemetry-instrumentation/tests {posargs}
+  test-instrumentation-aiohttp-client: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests {posargs}
+  test-instrumentation-aiohttp-server: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/tests {posargs}
+  test-instrumentation-aiopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/tests {posargs}
+  test-instrumentation-asgi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/tests {posargs}
+  test-instrumentation-asyncpg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/tests {posargs}
+  test-instrumentation-aws-lambda: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests {posargs}
+  test-instrumentation-boto: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/tests {posargs}
+  test-instrumentation-botocore: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/tests {posargs}
+  test-instrumentation-boto3sqs: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/tests {posargs}
+  test-instrumentation-cassandra: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/tests {posargs}
+  test-instrumentation-celery: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/tests {posargs}
+  test-instrumentation-dbapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/tests {posargs}
+  test-instrumentation-django-{1,2,3,4}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-django/tests {posargs}
+  test-instrumentation-elasticsearch-{2,5,6}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests {posargs}
+  test-instrumentation-falcon-{1,2,3}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests {posargs}
+  test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs}
+  test-instrumentation-flask-{213,220,300}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests {posargs}
+  test-instrumentation-urllib: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/tests {posargs}
+  test-instrumentation-urllib3v-{1,2}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/tests {posargs}
+  test-instrumentation-grpc: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/tests {posargs}
+  test-instrumentation-jinja2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/tests {posargs}
+  test-instrumentation-kafka-python: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/tests {posargs}
+  test-instrumentation-confluent-kafka: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/tests {posargs}
+  test-instrumentation-logging: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/tests {posargs}
+  test-instrumentation-mysql: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/tests {posargs}
+  test-instrumentation-mysqlclient: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests {posargs}
+  test-instrumentation-sio-pika-{0,1}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs}
+  test-instrumentation-aio-pika-{8,9}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs}
+  test-instrumentation-psycopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests {posargs}
+  test-instrumentation-psycopg2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests {posargs}
+  test-instrumentation-pymemcache-{135,200,300,342,400}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/tests {posargs}
+  test-instrumentation-pymongo: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/tests {posargs}
+  test-instrumentation-pymysql: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/tests {posargs}
+  test-instrumentation-pyramid: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/tests {posargs}
+  test-instrumentation-redis: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/tests {posargs}
+  test-instrumentation-remoulade: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/tests {posargs}
+  test-instrumentation-requests: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests {posargs}
+  test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs}
+  test-instrumentation-sqlalchemy-{11,14}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs}
+  test-instrumentation-sqlite3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/tests {posargs}
+  test-instrumentation-starlette: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/tests {posargs}
+  test-instrumentation-system-metrics: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/tests {posargs}
+  test-instrumentation-tornado: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests {posargs}
+  test-instrumentation-tortoiseorm: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests {posargs}
+  test-instrumentation-wsgi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/tests {posargs}
+  test-instrumentation-httpx-{18,21}: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests {posargs}
+  test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs}
+  test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
+  test-sdkextension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
+  test-resource-detector-container: pytest {toxinidir}/resource/opentelemetry-resource-detector-container/tests {posargs}
+  test-propagator-aws: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs}
+  test-propagator-ot-trace: pytest {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests {posargs}
+  test-exporter-richconsole: pytest {toxinidir}/exporter/opentelemetry-exporter-richconsole/tests {posargs}
+  test-exporter-prometheus-remote-write: pytest {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/tests {posargs}
   coverage: {toxinidir}/scripts/coverage.sh
 
 [testenv:docs]