Merge branch 'main' into tox-312

xrmx · Jun 7, 2024 · 992d8c7 · 992d8c7
2 parents 9336df4 + 0216a96
commit 992d8c7
Show file tree

Hide file tree

Showing 79 changed files with 238 additions and 390 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,10 @@ on how to become a [**Member**](https://github.com/open-telemetry/community/blob
 [**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
 and [**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
 
+Before you can contribute, you will need to sign the [Contributor License Agreement](https://docs.linuxfoundation.org/lfx/easycla/contributors).
+
+Please also read the [OpenTelemetry Contributor Guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md).
+
 ## Index
 
 * [Find a Buddy and get Started Quickly](#find-a-buddy-and-get-started-quickly)

diff --git a/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt b/exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
@@ -1,18 +1,16 @@
 asgiref==3.7.2
-attrs==23.2.0
 certifi==2024.2.2
 charset-normalizer==3.3.2
 cramjam==2.8.1
 Deprecated==1.2.14
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
+packaging==24.0
+pluggy==1.5.0
 protobuf==4.25.3
-py==1.11.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-snappy==0.7.1
 requests==2.31.0

diff --git a/exporter/opentelemetry-exporter-richconsole/test-requirements.txt b/exporter/opentelemetry-exporter-richconsole/test-requirements.txt
@@ -1,17 +1,15 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 flaky==3.7.0
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 markdown-it-py==3.0.0
 mdurl==0.1.2
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
 Pygments==2.17.2
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 rich==13.7.1
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-0.txt
@@ -1,18 +1,16 @@
 aio-pika==7.2.0
 aiormq==6.2.3
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.1.0
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt
@@ -1,18 +1,16 @@
 aio-pika==8.3.0
 aiormq==6.6.4
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.2.1
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt
@@ -1,18 +1,16 @@
 aio-pika==9.0.5
 aiormq==6.7.1
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.2.1
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt b/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt
@@ -1,18 +1,16 @@
 aio-pika==9.4.1
 aiormq==6.8.0
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
+packaging==24.0
 pamqp==3.3.0
-pluggy==1.4.0
-py==1.11.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt
@@ -2,7 +2,6 @@ aiohttp==3.9.3
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3
-attrs==23.2.0
 blinker==1.7.0
 certifi==2024.2.2
 charset-normalizer==3.3.2
@@ -18,11 +17,10 @@ itsdangerous==2.1.2
 Jinja2==3.1.3
 MarkupSafe==2.1.5
 multidict==6.0.5
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 requests==2.31.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt
@@ -2,18 +2,16 @@ aiohttp==3.9.3
 aiosignal==1.3.1
 asgiref==3.7.2
 async-timeout==4.0.3
-attrs==23.2.0
 Deprecated==1.2.14
 frozenlist==1.4.1
 idna==3.6
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 multidict==6.0.5
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-aiohttp==1.0.5
 pytest-asyncio==0.23.5
 pytest-benchmark==4.0.0

diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt
@@ -1,17 +1,15 @@
 aiopg==1.4.0
 asgiref==3.7.2
 async-timeout==4.0.3
-attrs==23.2.0
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 install==1.3.5
-packaging==23.2
-pluggy==1.4.0
+packaging==24.0
+pluggy==1.5.0
 psycopg2-binary==2.9.9
-py==1.11.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.10.0

diff --git a/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-asyncio==0.23.5
 pytest-benchmark==4.0.0
 tomli==2.0.1

diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt
@@ -1,15 +1,13 @@
 asgiref==3.7.2
 async-timeout==4.0.3
 asyncpg==0.29.0
-attrs==23.2.0
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
-attrs==23.2.0
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 tomli==2.0.1
 typing_extensions==4.9.0

diff --git a/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt
@@ -1,5 +1,4 @@
 asgiref==3.7.2
-attrs==23.2.0
 boto==2.49.0
 boto3==1.34.44
 botocore==1.34.44
@@ -16,12 +15,11 @@ Jinja2==3.1.4
 jmespath==1.0.1
 MarkupSafe==2.1.5
 moto==2.3.2
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
 pycparser==2.21
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 pytz==2024.1

diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt
@@ -1,16 +1,14 @@
 asgiref==3.7.2
-attrs==23.2.0
 boto3==1.34.44
 botocore==1.34.44
 Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 jmespath==1.0.1
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 s3transfer==0.10.0

diff --git a/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt
@@ -1,5 +1,4 @@
 asgiref==3.7.2
-attrs==23.2.0
 aws-xray-sdk==2.12.1
 boto3==1.28.80
 botocore==1.31.80
@@ -16,12 +15,11 @@ Jinja2==3.1.4
 jmespath==1.0.1
 MarkupSafe==2.0.1
 moto==3.1.19
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
 pycparser==2.21
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 pytz==2024.1

diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt b/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt
@@ -1,16 +1,14 @@
 asgiref==3.7.2
-attrs==23.2.0
 cassandra-driver==3.29.0
 click==8.1.7
 Deprecated==1.2.14
 geomet==0.2.1.post1
 importlib-metadata==6.11.0
 iniconfig==2.0.0
-packaging==23.2
-pluggy==1.4.0
-py==1.11.0
+packaging==24.0
+pluggy==1.5.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 PyYAML==6.0.1
 scylla-driver==3.26.6

diff --git a/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt b/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt
@@ -1,6 +1,5 @@
 amqp==5.2.0
 asgiref==3.7.2
-attrs==23.2.0
 backports.zoneinfo==0.2.1
 billiard==4.2.0
 celery==5.3.6
@@ -12,12 +11,11 @@ Deprecated==1.2.14
 importlib-metadata==6.11.0
 iniconfig==2.0.0
 kombu==5.3.5
-packaging==23.2
-pluggy==1.4.0
+packaging==24.0
+pluggy==1.5.0
 prompt-toolkit==3.0.43
-py==1.11.0
 py-cpuinfo==9.0.0
-pytest==7.1.3
+pytest==7.4.4
 pytest-benchmark==4.0.0
 python-dateutil==2.8.2
 six==1.16.0