From ed4a759163d92240eb727fba7d12d77ab33fe87c Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 13:26:49 -0500 Subject: [PATCH 01/69] Separate lint for flask --- tox.ini | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index cbe9c7d981..e7a53eb30f 100644 --- a/tox.ini +++ b/tox.ini @@ -106,6 +106,7 @@ envlist = py3{8,9,10,11}-test-instrumentation-flask-{0,1} py3{8,9,10,11}-test-instrumentation-flask-{2} pypy3-test-instrumentation-flask-{0,1} + lint-instrumentation-flask ; opentelemetry-instrumentation-urllib py3{8,9,10,11}-test-instrumentation-urllib @@ -308,6 +309,7 @@ envlist = [testenv] deps = -c dev-requirements.txt + lint: -r dev-requirements.txt test: pytest test: pytest-benchmark coverage: pytest @@ -425,7 +427,7 @@ commands_pre = flask: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils flask-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt - flask-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt + flask-2, lint-instrumentation-flask: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt urllib: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api urllib: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -713,7 +715,14 @@ commands = test-instrumentation-elasticsearch: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests {posargs} test-instrumentation-falcon: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests {posargs} test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs} + test-instrumentation-flask: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests {posargs} + lint-instrumentation-flask: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-flask + lint-instrumentation-flask: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-flask + lint-instrumentation-flask: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-flask + lint-instrumentation-flask: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry + lint-instrumentation-flask: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests + test-instrumentation-urllib: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/tests {posargs} test-instrumentation-urllib3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/tests {posargs} test-instrumentation-grpc: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/tests {posargs} @@ -803,7 +812,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt From 8891864682ff9225ed248ec30ddcb1edd3c23d71 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:06:24 -0500 Subject: [PATCH 02/69] Seaparate lint for resource-detector-container --- tox.ini | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index e7a53eb30f..191cfe0204 100644 --- a/tox.ini +++ b/tox.ini @@ -9,6 +9,7 @@ envlist = ; opentelemetry-resource-detector-container py3{8,9,10,11}-test-resource-detector-container pypy3-test-resource-detector-container + lint-resource-detector-container ; opentelemetry-sdk-extension-aws py3{8,9,10,11}-test-sdk-extension-aws @@ -671,7 +672,7 @@ commands_pre = resource-detector-container: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions resource-detector-container: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk resource-detector-container: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils - resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt + resource-detector-container, lint-resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt propagator-ot-trace: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api propagator-ot-trace: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -756,7 +757,14 @@ commands = test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs} test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs} test-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs} + test-resource-detector-container: pytest {toxinidir}/resource/opentelemetry-resource-detector-container/tests {posargs} + lint-resource-detector-container: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/resource/opentelemetry-resource-detector-container + lint-resource-detector-container: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/resource/opentelemetry-resource-detector-container + lint-resource-detector-container: flake8 --config {toxinidir}/.flake8 {toxinidir}/resource/opentelemetry-resource-detector-container + lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/src/opentelemetry + lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/tests + test-processor-baggage: pytest {toxinidir}/processor/opentelemetry-processor-baggage/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} @@ -855,7 +863,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt # requires snappy headers to be available on the system - pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt From 09922ca3fc87878799f07355d066e8aed174ace4 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:26:04 -0500 Subject: [PATCH 03/69] Add linting workflow --- .github/workflows/lint_0.yml | 44 ++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/lint_0.yml diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml new file mode 100644 index 0000000000..1119b0ac32 --- /dev/null +++ b/.github/workflows/lint_0.yml @@ -0,0 +1,44 @@ +name: Lint tests + +on: + push: + branches-ignore: + - 'release/*' + pull_request: +env: + CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2 + +jobs: + lint-0: + strategy: + fail-fast: false # ensures the entire test matrix is run, even if one permutation fails + matrix: + package: + # Do not add more instrumentations here, add them in lint_1.yml. + # The reason for this separation of instrumentations into more than one YAML file is + # the limit of jobs that can be run from a Github actions matrix: + # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs + # "A matrix will generate a maximum of 256 jobs per workflow run. This limit applies + # to both GitHub-hosted and self-hosted runners." + - "instrumentation-flask" + - "resource-detector-container" + os: [ubuntu-20.04] + steps: + - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + - name: Install tox + run: pip install tox + - name: Cache tox environment + # Preserves .tox directory between runs for faster installs + uses: actions/cache@v4 + with: + path: | + .tox + ~/.cache/pip + key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }} + - name: run tox + run: tox -e lint-${{ matrix.package }} From c8ae3ae486a1ee7521737efb210a40230a1659c3 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:27:52 -0500 Subject: [PATCH 04/69] Update contributing documentation --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0c18392bc7..3c4bae0f47 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -62,13 +62,13 @@ You can run `tox` with the following arguments: - `tox -e py311-test-instrumentation-aiopg` to e.g. run the aiopg instrumentation unit tests under a specific Python version - `tox -e spellcheck` to run a spellcheck on all the code -- `tox -e lint` to run lint checks on all code +- `tox -e lint-some-package` to run lint checks on `some-package` `black` and `isort` are executed when `tox -e lint` is run. The reported errors can be tedious to fix manually. An easier way to do so is: -1. Run `.tox/lint/bin/black .` -2. Run `.tox/lint/bin/isort .` +1. Run `.tox/lint-some-package/bin/black .` +2. Run `.tox/lint-some-package/bin/isort .` See [`tox.ini`](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/tox.ini) From 1ef1c4fedf566ecaf6d8044071f625678ab2bb23 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:31:01 -0500 Subject: [PATCH 05/69] Fix lint workflow --- .github/workflows/lint_0.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 1119b0ac32..840a5d46a4 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -23,6 +23,7 @@ jobs: - "instrumentation-flask" - "resource-detector-container" os: [ubuntu-20.04] + runs-on: ubuntu-20.04 steps: - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} uses: actions/checkout@v4 From 85c70b3ce9de81852f1fe0dfec4fef4a599b7c86 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:40:01 -0500 Subject: [PATCH 06/69] Add fix for resource-detector-container --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 191cfe0204..29475ea865 100644 --- a/tox.ini +++ b/tox.ini @@ -672,7 +672,7 @@ commands_pre = resource-detector-container: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions resource-detector-container: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk resource-detector-container: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils - resource-detector-container, lint-resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt + resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt propagator-ot-trace: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api propagator-ot-trace: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions From 97bc34c8a90ffdbb8cb943c9b1c49b3b889c3702 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:44:37 -0500 Subject: [PATCH 07/69] Separate lint for sdk-extension-aws --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 840a5d46a4..d5bf0fd2fa 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -22,6 +22,7 @@ jobs: # to both GitHub-hosted and self-hosted runners." - "instrumentation-flask" - "resource-detector-container" + - "sdk-extension-aws" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 29475ea865..e9a7037249 100644 --- a/tox.ini +++ b/tox.ini @@ -14,6 +14,7 @@ envlist = ; opentelemetry-sdk-extension-aws py3{8,9,10,11}-test-sdk-extension-aws pypy3-test-sdk-extension-aws + lint-sdk-extension-aws ; opentelemetry-distro py3{8,9,10,11}-test-distro @@ -756,7 +757,13 @@ commands = test-instrumentation-httpx: 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-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs} + lint-sdk-extension-aws: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws + lint-sdk-extension-aws: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws + lint-sdk-extension-aws: flake8 --config {toxinidir}/.flake8 {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws + lint-sdk-extension-aws: pylint {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry + lint-sdk-extension-aws: pylint {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests test-resource-detector-container: pytest {toxinidir}/resource/opentelemetry-resource-detector-container/tests {posargs} lint-resource-detector-container: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/resource/opentelemetry-resource-detector-container @@ -866,7 +873,6 @@ commands_pre = pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt - pip install -r {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/test-requirements.txt pip install -r {toxinidir}/opentelemetry-distro/test-requirements.txt commands = From 6fc60914e5ec9b11575c953e1df812c7541d1864 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 14:55:11 -0500 Subject: [PATCH 08/69] Separate lint for distro --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index d5bf0fd2fa..c82cfc089d 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -23,6 +23,7 @@ jobs: - "instrumentation-flask" - "resource-detector-container" - "sdk-extension-aws" + - "distro" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index e9a7037249..134b18e9e7 100644 --- a/tox.ini +++ b/tox.ini @@ -19,6 +19,7 @@ envlist = ; opentelemetry-distro py3{8,9,10,11}-test-distro pypy3-test-distro + lint-distro ; opentelemetry-instrumentation py3{8,9,10,11}-test-opentelemetry-instrumentation @@ -700,6 +701,12 @@ commands_pre = commands = test-distro: pytest {toxinidir}/opentelemetry-distro/tests {posargs} + lint-distro: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-distro + lint-distro: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-distro + lint-distro: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-distro + lint-distro: pylint {toxinidir}/opentelemetry-distro/src/opentelemetry + lint-distro: pylint {toxinidir}/opentelemetry-distro/tests + 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} @@ -873,7 +880,6 @@ commands_pre = pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt - pip install -r {toxinidir}/opentelemetry-distro/test-requirements.txt commands = python scripts/eachdist.py lint --check-only From 547291bd5dcab7ca9ce30fd99b761a969377a6d4 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:05:22 -0500 Subject: [PATCH 09/69] Separate lint for opentelemetry-instrumentation --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index c82cfc089d..55116d3bb6 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -24,6 +24,7 @@ jobs: - "resource-detector-container" - "sdk-extension-aws" - "distro" + - "opentelemetry-instrumentation" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 134b18e9e7..28b7a57829 100644 --- a/tox.ini +++ b/tox.ini @@ -24,6 +24,7 @@ envlist = ; opentelemetry-instrumentation py3{8,9,10,11}-test-opentelemetry-instrumentation pypy3-test-opentelemetry-instrumentation + lint-opentelemetry-instrumentation ; opentelemetry-instrumentation-aiohttp-client py3{8,9,10,11}-test-instrumentation-aiohttp-client @@ -708,6 +709,12 @@ commands = lint-distro: pylint {toxinidir}/opentelemetry-distro/tests test-opentelemetry-instrumentation: pytest {toxinidir}/opentelemetry-instrumentation/tests {posargs} + lint-instrumentation: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-instrumentation + lint-instrumentation: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-instrumentation + lint-instrumentation: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-instrumentation + lint-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/src/opentelemetry + lint-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/tests + 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} From 19068aba01403448a328e9b631be1de3d02d5e2a Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:09:26 -0500 Subject: [PATCH 10/69] Separate lint for aiohttp-client --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 55116d3bb6..8638b8bfff 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -25,6 +25,7 @@ jobs: - "sdk-extension-aws" - "distro" - "opentelemetry-instrumentation" + - "instrumentation-aiohttp-client" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 28b7a57829..d9243c58f5 100644 --- a/tox.ini +++ b/tox.ini @@ -29,6 +29,7 @@ envlist = ; opentelemetry-instrumentation-aiohttp-client py3{8,9,10,11}-test-instrumentation-aiohttp-client pypy3-test-instrumentation-aiohttp-client + lint-instrumentation-aiohttp-client ; opentelemetry-instrumentation-aiohttp-server py3{8,9,10,11}-test-instrumentation-aiohttp-server @@ -716,6 +717,12 @@ commands = lint-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/tests test-instrumentation-aiohttp-client: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests {posargs} + lint-instrumentation-aiohttp-client: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client + lint-instrumentation-aiohttp-client: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client + lint-instrumentation-aiohttp-client: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client + lint-instrumentation-aiohttp-client: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry + lint-instrumentation-aiohttp-client: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests + 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} @@ -855,7 +862,6 @@ commands_pre = ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt From 0aa270799ddfc1e7e02027ac032a846ee79e2cbc Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:24:01 -0500 Subject: [PATCH 11/69] Separate lint for aiohttp-server --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 8638b8bfff..d3b4c51d72 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -26,6 +26,7 @@ jobs: - "distro" - "opentelemetry-instrumentation" - "instrumentation-aiohttp-client" + - "instrumentation-aiohttp-server" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index d9243c58f5..661321690d 100644 --- a/tox.ini +++ b/tox.ini @@ -34,6 +34,7 @@ envlist = ; opentelemetry-instrumentation-aiohttp-server py3{8,9,10,11}-test-instrumentation-aiohttp-server pypy3-test-instrumentation-aiohttp-server + lint-instrumentation-aiohttp-server ; opentelemetry-instrumentation-aiopg py3{8,9,10,11}-test-instrumentation-aiopg @@ -724,6 +725,12 @@ commands = lint-instrumentation-aiohttp-client: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests test-instrumentation-aiohttp-server: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/tests {posargs} + lint-instrumentation-aiohttp-server: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server + lint-instrumentation-aiohttp-server: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server + lint-instrumentation-aiohttp-server: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server + lint-instrumentation-aiohttp-server: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry + lint-instrumentation-aiohttp-server: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/tests + 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} @@ -863,7 +870,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt From 2e3f4e5cc3c95ea51ba2b18005fd111ce32ff690 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:26:17 -0500 Subject: [PATCH 12/69] Separate lint for aiopg --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index d3b4c51d72..680f20818f 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -27,6 +27,7 @@ jobs: - "opentelemetry-instrumentation" - "instrumentation-aiohttp-client" - "instrumentation-aiohttp-server" + - "instrumentation-aiopg" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 661321690d..13f399eb69 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,7 @@ envlist = ; opentelemetry-instrumentation-aiopg py3{8,9,10,11}-test-instrumentation-aiopg ; instrumentation-aiopg intentionally excluded from pypy3 + lint-instrumentation-aiopg ; opentelemetry-instrumentation-aws-lambda py3{8,9,10,11}-test-instrumentation-aws-lambda @@ -732,6 +733,12 @@ commands = lint-instrumentation-aiohttp-server: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-server/tests test-instrumentation-aiopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/tests {posargs} + lint-instrumentation-aiopg: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg + lint-instrumentation-aiopg: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg + lint-instrumentation-aiopg: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg + lint-instrumentation-aiopg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry + lint-instrumentation-aiopg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/tests + 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} @@ -869,7 +876,6 @@ commands_pre = ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt From 5d9569d07d9fc51cc532aa91e0687a04cfcd1d1e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:27:41 -0500 Subject: [PATCH 13/69] Separate lint for aws-lambda --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 680f20818f..76487fbb08 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -28,6 +28,7 @@ jobs: - "instrumentation-aiohttp-client" - "instrumentation-aiohttp-server" - "instrumentation-aiopg" + - "instrumentation-aws-lambda" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 13f399eb69..8e74cfa1bc 100644 --- a/tox.ini +++ b/tox.ini @@ -44,6 +44,7 @@ envlist = ; opentelemetry-instrumentation-aws-lambda py3{8,9,10,11}-test-instrumentation-aws-lambda pypy3-test-instrumentation-aws-lambda + lint-instrumentation-aws-lambda ; opentelemetry-instrumentation-botocore py3{8,9,10,11}-test-instrumentation-botocore @@ -741,7 +742,14 @@ commands = 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} + lint-instrumentation-aws-lambda: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda + lint-instrumentation-aws-lambda: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda + lint-instrumentation-aws-lambda: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda + lint-instrumentation-aws-lambda: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry + lint-instrumentation-aws-lambda: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests + 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} @@ -894,7 +902,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt From f2ad5d2795add2ea9b1f84e3b1b5c49880a0c772 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:30:16 -0500 Subject: [PATCH 14/69] Separate lint for botocore --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 76487fbb08..b5253badf5 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -29,6 +29,7 @@ jobs: - "instrumentation-aiohttp-server" - "instrumentation-aiopg" - "instrumentation-aws-lambda" + - "instrumentation-botocore" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 8e74cfa1bc..2cb6055152 100644 --- a/tox.ini +++ b/tox.ini @@ -50,6 +50,7 @@ envlist = py3{8,9,10,11}-test-instrumentation-botocore ; FIXME: see https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1736 ; pypy3-test-instrumentation-botocore + lint-instrumentation-botocore ; opentelemetry-instrumentation-boto3sqs py3{8,9,10,11}-test-instrumentation-boto3sqs @@ -751,7 +752,14 @@ commands = lint-instrumentation-aws-lambda: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests test-instrumentation-boto: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/tests {posargs} + test-instrumentation-botocore: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/tests {posargs} + lint-instrumentation-botocore: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore + lint-instrumentation-botocore: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore + lint-instrumentation-botocore: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore + lint-instrumentation-botocore: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry + lint-instrumentation-botocore: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/tests + 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} @@ -864,7 +872,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt From 58007705c406bd76c783f42857cc63390295f618 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:32:03 -0500 Subject: [PATCH 15/69] Separate lint for boto3sqs --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index b5253badf5..c3e0484406 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -30,6 +30,7 @@ jobs: - "instrumentation-aiopg" - "instrumentation-aws-lambda" - "instrumentation-botocore" + - "instrumentation-boto3sqs" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 2cb6055152..c48b167c29 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,7 @@ envlist = py3{8,9,10,11}-test-instrumentation-boto3sqs ; FIXME: see https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1736 ; pypy3-test-instrumentation-boto3sqs + lint-instrumentation-boto3sqs ; opentelemetry-instrumentation-django ; Only officially supported Python versions are tested for each Django @@ -761,6 +762,12 @@ commands = lint-instrumentation-botocore: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/tests test-instrumentation-boto3sqs: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/tests {posargs} + lint-instrumentation-boto3sqs: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs + lint-instrumentation-boto3sqs: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs + lint-instrumentation-boto3sqs: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs + lint-instrumentation-boto3sqs: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry + lint-instrumentation-boto3sqs: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/tests + 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} @@ -881,7 +888,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt From 4da0f2074e519c4957460109c705e732af56f823 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:35:12 -0500 Subject: [PATCH 16/69] Separate lint for django --- .github/workflows/lint_0.yml | 1 + tox.ini | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index c3e0484406..af9b4d21ba 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -31,6 +31,7 @@ jobs: - "instrumentation-aws-lambda" - "instrumentation-botocore" - "instrumentation-boto3sqs" + - "instrumentation-django" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index c48b167c29..cbc2aba806 100644 --- a/tox.ini +++ b/tox.ini @@ -74,6 +74,7 @@ envlist = py3{10,11}-test-instrumentation-django-1 py3{10,11}-test-instrumentation-django-3 pypy3-test-instrumentation-django-{0,1} + lint-instrumentation-django ; opentelemetry-instrumentation-dbapi py3{8,9,10,11}-test-instrumentation-dbapi @@ -481,6 +482,7 @@ commands_pre = py3{10,11}-test-instrumentation-django-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt pypy3-test-instrumentation-django-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-0.txt pypy3-test-instrumentation-django-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-1.txt + lint-instrumentation-django: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt fastapi: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api fastapi: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -771,7 +773,14 @@ commands = 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: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-django/tests {posargs} + lint-instrumentation-django: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-django + lint-instrumentation-django: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-django + lint-instrumentation-django: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-django + lint-instrumentation-django: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry + lint-instrumentation-django: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-django/tests + test-instrumentation-elasticsearch: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests {posargs} test-instrumentation-falcon: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests {posargs} test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs} @@ -880,7 +889,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-django/test-requirements-3.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt From 354c5bfc0ffc5a0e43b41e1fc1ccb6acef330741 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:36:51 -0500 Subject: [PATCH 17/69] Separate lint for dbapi --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index af9b4d21ba..83b22c68d6 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -32,6 +32,7 @@ jobs: - "instrumentation-botocore" - "instrumentation-boto3sqs" - "instrumentation-django" + - "instrumentation-dbapi" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index cbc2aba806..1907276c35 100644 --- a/tox.ini +++ b/tox.ini @@ -79,6 +79,7 @@ envlist = ; opentelemetry-instrumentation-dbapi py3{8,9,10,11}-test-instrumentation-dbapi pypy3-test-instrumentation-dbapi + lint-instrumentation-dbapi ; opentelemetry-instrumentation-boto py3{8,9,10,11}-test-instrumentation-boto @@ -772,7 +773,13 @@ commands = 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} + lint-instrumentation-dbapi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi + lint-instrumentation-dbapi: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi + lint-instrumentation-dbapi: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi + lint-instrumentation-dbapi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry + lint-instrumentation-dbapi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/tests test-instrumentation-django: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-django/tests {posargs} lint-instrumentation-django: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-django @@ -887,7 +894,6 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt From 4f8033455e661b726492ffcb292fb4893a47f33e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:38:46 -0500 Subject: [PATCH 18/69] Separate lint for boto --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 83b22c68d6..41de648fe2 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -33,6 +33,7 @@ jobs: - "instrumentation-boto3sqs" - "instrumentation-django" - "instrumentation-dbapi" + - "instrumentation-boto" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 1907276c35..3adbff33c3 100644 --- a/tox.ini +++ b/tox.ini @@ -85,6 +85,7 @@ envlist = py3{8,9,10,11}-test-instrumentation-boto ; FIXME: see https://github.com/open-telemetry/opentelemetry-python-contrib/issues/1736 ; pypy3-test-instrumentation-boto + lint-instrumentation-boto ; opentelemetry-instrumentation-elasticsearch ; The numbers at the end of the environment names @@ -756,6 +757,11 @@ commands = lint-instrumentation-aws-lambda: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests test-instrumentation-boto: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/tests {posargs} + lint-instrumentation-boto: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-boto + lint-instrumentation-boto: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-boto + lint-instrumentation-boto: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-boto + lint-instrumentation-boto: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry + lint-instrumentation-boto: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/tests test-instrumentation-botocore: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore/tests {posargs} lint-instrumentation-botocore: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-botocore @@ -901,7 +907,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-boto/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt From 12448da319b5c39b2c25d4b2d1493b926e96f3b9 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:44:03 -0500 Subject: [PATCH 19/69] Separate lint for elasticsearch --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 41de648fe2..8254f9a619 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -34,6 +34,7 @@ jobs: - "instrumentation-django" - "instrumentation-dbapi" - "instrumentation-boto" + - "instrumentation-elasticsearch" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 3adbff33c3..2b28c8099a 100644 --- a/tox.ini +++ b/tox.ini @@ -94,6 +94,7 @@ envlist = ; 1: elasticsearch-dsl==7.4.1 elasticsearch==7.17.9 py3{8,9,10,11}-test-instrumentation-elasticsearch-{0,1} pypy3-test-instrumentation-elasticsearch-{0,1} + lint-instrumentation-elasticsearch ; opentelemetry-instrumentation-falcon ; py310 does not work with falcon 1 @@ -795,6 +796,12 @@ commands = lint-instrumentation-django: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-django/tests test-instrumentation-elasticsearch: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests {posargs} + lint-instrumentation-elasticsearch: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch + lint-instrumentation-elasticsearch: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch + lint-instrumentation-elasticsearch: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch + lint-instrumentation-elasticsearch: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry + lint-instrumentation-elasticsearch: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests + test-instrumentation-falcon: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests {posargs} test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs} @@ -929,7 +936,6 @@ commands_pre = # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install # for your OS to install the required dependencies pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt From 05f601b06a5d612bf0d9934009af3ee697298e53 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:46:20 -0500 Subject: [PATCH 20/69] Separate lint for falcon --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 8254f9a619..03a23aa873 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -35,6 +35,7 @@ jobs: - "instrumentation-dbapi" - "instrumentation-boto" - "instrumentation-elasticsearch" + - "instrumentation-falcon" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 2b28c8099a..ece6f3b931 100644 --- a/tox.ini +++ b/tox.ini @@ -106,6 +106,7 @@ envlist = py3{8,9}-test-instrumentation-falcon-0 py3{8,9,10,11}-test-instrumentation-falcon-{1,2} pypy3-test-instrumentation-falcon-{0,1,2} + lint-instrumentation-falcon ; opentelemetry-instrumentation-fastapi py3{8,9,10,11}-test-instrumentation-fastapi @@ -434,6 +435,7 @@ commands_pre = falcon-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-0.txt falcon-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-1.txt falcon-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt + lint-instrumentation-falcon: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt flask: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api flask: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -803,6 +805,12 @@ commands = lint-instrumentation-elasticsearch: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/tests test-instrumentation-falcon: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests {posargs} + lint-instrumentation-falcon: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon + lint-instrumentation-falcon: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon + lint-instrumentation-falcon: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon + lint-instrumentation-falcon: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry + lint-instrumentation-falcon: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests + test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs} test-instrumentation-flask: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests {posargs} @@ -909,7 +917,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt From 2d31edd0223f2d414ddab7633fe1de372a390bae Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:48:24 -0500 Subject: [PATCH 21/69] Separate lint for fastapi --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 03a23aa873..0963dc3a48 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -36,6 +36,7 @@ jobs: - "instrumentation-boto" - "instrumentation-elasticsearch" - "instrumentation-falcon" + - "instrumentation-fastapi" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index ece6f3b931..b9ad70fb15 100644 --- a/tox.ini +++ b/tox.ini @@ -111,6 +111,7 @@ envlist = ; opentelemetry-instrumentation-fastapi py3{8,9,10,11}-test-instrumentation-fastapi pypy3-test-instrumentation-fastapi + lint-instrumentation-fastapi ; opentelemetry-instrumentation-flask ; The numbers at the end of the environment names @@ -812,6 +813,11 @@ commands = lint-instrumentation-falcon: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-falcon/tests test-instrumentation-fastapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests {posargs} + lint-instrumentation-fastapi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi + lint-instrumentation-fastapi: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi + lint-instrumentation-fastapi: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi + lint-instrumentation-fastapi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry + lint-instrumentation-fastapi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/tests test-instrumentation-flask: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests {posargs} lint-instrumentation-flask: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-flask @@ -923,7 +929,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-fastapi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt From 84fdacc54133617b4df1234c03fd8a567330a407 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:49:58 -0500 Subject: [PATCH 22/69] Separate lint for urllib --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 0963dc3a48..bdcd4954bb 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -37,6 +37,7 @@ jobs: - "instrumentation-elasticsearch" - "instrumentation-falcon" - "instrumentation-fastapi" + - "instrumentation-urllib" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index b9ad70fb15..66668b4db5 100644 --- a/tox.ini +++ b/tox.ini @@ -127,6 +127,7 @@ envlist = ; opentelemetry-instrumentation-urllib py3{8,9,10,11}-test-instrumentation-urllib pypy3-test-instrumentation-urllib + lint-instrumentation-urllib ; opentelemetry-instrumentation-urllib3 ; The numbers at the end of the environment names @@ -827,6 +828,12 @@ commands = lint-instrumentation-flask: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/tests test-instrumentation-urllib: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/tests {posargs} + lint-instrumentation-urllib: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib + lint-instrumentation-urllib: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib + lint-instrumentation-urllib: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib + lint-instrumentation-urllib: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry + lint-instrumentation-urllib: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/tests + test-instrumentation-urllib3: 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} @@ -939,7 +946,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt From a9b7a1e6b8902cb310dd197707513724da8ee85c Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:52:36 -0500 Subject: [PATCH 23/69] Separate lint for urllib3 --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index bdcd4954bb..3cdb44e0af 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -38,6 +38,7 @@ jobs: - "instrumentation-falcon" - "instrumentation-fastapi" - "instrumentation-urllib" + - "instrumentation-urllib3" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 66668b4db5..1426ae5e7c 100644 --- a/tox.ini +++ b/tox.ini @@ -136,6 +136,7 @@ envlist = ; 1: urllib3 >=2.0.0,<3.0.0 py3{8,9,10,11}-test-instrumentation-urllib3-{0,1} pypy3-test-instrumentation-urllib3-{0,1} + lint-instrumentation-urllib3 ; opentelemetry-instrumentation-requests py3{8,9,10,11}-test-instrumentation-requests @@ -459,6 +460,7 @@ commands_pre = urllib3: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils urllib3-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-0.txt urllib3-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt + lint-instrumentation-urllib3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt botocore: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api botocore: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -835,6 +837,12 @@ commands = lint-instrumentation-urllib: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib/tests test-instrumentation-urllib3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/tests {posargs} + lint-instrumentation-urllib3: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3 + lint-instrumentation-urllib3: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3 + lint-instrumentation-urllib3: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3 + lint-instrumentation-urllib3: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry + lint-instrumentation-urllib3: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/tests + 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} @@ -946,7 +954,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt From ba68b72ae20b76ed09bfa5a6213394689f1d0ad8 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:54:34 -0500 Subject: [PATCH 24/69] Separate lint for requests --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 3cdb44e0af..c0172d5903 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -39,6 +39,7 @@ jobs: - "instrumentation-fastapi" - "instrumentation-urllib" - "instrumentation-urllib3" + - "instrumentation-requests" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 1426ae5e7c..1ec42843b0 100644 --- a/tox.ini +++ b/tox.ini @@ -141,6 +141,7 @@ envlist = ; opentelemetry-instrumentation-requests py3{8,9,10,11}-test-instrumentation-requests ;pypy3-test-instrumentation-requests + lint-instrumentation-requests ; opentelemetry-instrumentation-starlette py3{8,9,10,11}-test-instrumentation-starlette @@ -860,7 +861,14 @@ commands = 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} + lint-instrumentation-requests: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-requests + lint-instrumentation-requests: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-requests + lint-instrumentation-requests: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-requests + lint-instrumentation-requests: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry + lint-instrumentation-requests: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests + test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs} test-instrumentation-sqlalchemy: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs} test-instrumentation-sqlite3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/tests {posargs} @@ -953,7 +961,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt From 9eac55e737f72962e4ccc41056fd17107b603c9c Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:56:08 -0500 Subject: [PATCH 25/69] Separate lint for starlette --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index c0172d5903..18aef00ac6 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -40,6 +40,7 @@ jobs: - "instrumentation-urllib" - "instrumentation-urllib3" - "instrumentation-requests" + - "instrumentation-starlette" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 1ec42843b0..36f1f10e6f 100644 --- a/tox.ini +++ b/tox.ini @@ -146,6 +146,7 @@ envlist = ; opentelemetry-instrumentation-starlette py3{8,9,10,11}-test-instrumentation-starlette pypy3-test-instrumentation-starlette + lint-instrumentation-starlette ; opentelemetry-instrumentation-jinja2 py3{8,9,10,11}-test-instrumentation-jinja2 @@ -872,7 +873,14 @@ commands = test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs} test-instrumentation-sqlalchemy: 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} + lint-instrumentation-starlette: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette + lint-instrumentation-starlette: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette + lint-instrumentation-starlette: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette + lint-instrumentation-starlette: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry + lint-instrumentation-starlette: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/tests + test-instrumentation-system-metrics: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/tests {posargs} test-instrumentation-threading: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/tests {posargs} test-instrumentation-tornado: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests {posargs} @@ -945,7 +953,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt From 22f7dd24c069dc3ec23b557bebc83cc3f46d6118 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:57:31 -0500 Subject: [PATCH 26/69] Separate lint for jinja2 --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 18aef00ac6..53e82af769 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -41,6 +41,7 @@ jobs: - "instrumentation-urllib3" - "instrumentation-requests" - "instrumentation-starlette" + - "instrumentation-jinja2" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 36f1f10e6f..8f8a8eb8f2 100644 --- a/tox.ini +++ b/tox.ini @@ -151,6 +151,7 @@ envlist = ; opentelemetry-instrumentation-jinja2 py3{8,9,10,11}-test-instrumentation-jinja2 pypy3-test-instrumentation-jinja2 + lint-instrumentation-jinja2 ; opentelemetry-instrumentation-logging py3{8,9,10,11}-test-instrumentation-logging @@ -847,6 +848,12 @@ commands = test-instrumentation-grpc: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/tests {posargs} test-instrumentation-jinja2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/tests {posargs} + lint-instrumentation-jinja2: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2 + lint-instrumentation-jinja2: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2 + lint-instrumentation-jinja2: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2 + lint-instrumentation-jinja2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry + lint-instrumentation-jinja2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/tests + 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} @@ -959,7 +966,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt From 3cff055fc56a70eb869b382c979316408a93e56a Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 15:59:08 -0500 Subject: [PATCH 27/69] Seaparate lint for logging and richconsole --- .github/workflows/lint_0.yml | 2 ++ tox.ini | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 53e82af769..c1cab0971c 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -42,6 +42,8 @@ jobs: - "instrumentation-requests" - "instrumentation-starlette" - "instrumentation-jinja2" + - "instrumentation-logging" + - "exporter-richconsole" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 8f8a8eb8f2..53af662df1 100644 --- a/tox.ini +++ b/tox.ini @@ -156,10 +156,12 @@ envlist = ; opentelemetry-instrumentation-logging py3{8,9,10,11}-test-instrumentation-logging pypy3-test-instrumentation-logging + lint-instrumentation-logging ; opentelemetry-exporter-richconsole py3{8,9,10,11}-test-exporter-richconsole pypy3-test-exporter-richconsole + lint-exporter-richconsole ; opentelemetry-exporter-prometheus-remote-write py3{8,9,10,11}-test-exporter-prometheus-remote-write @@ -856,7 +858,14 @@ commands = 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} + lint-instrumentation-logging: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-logging + lint-instrumentation-logging: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-logging + lint-instrumentation-logging: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-logging + lint-instrumentation-logging: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry + lint-instrumentation-logging: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/tests + 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: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} @@ -914,7 +923,14 @@ commands = test-processor-baggage: pytest {toxinidir}/processor/opentelemetry-processor-baggage/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} + lint-exporter-richconsole: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-richconsole + lint-exporter-richconsole: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/exporter/opentelemetry-exporter-richconsole + lint-exporter-richconsole: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-richconsole + lint-exporter-richconsole: pylint {toxinidir}/exporter/opentelemetry-exporter-richconsole/src/opentelemetry + lint-exporter-richconsole: pylint {toxinidir}/exporter/opentelemetry-exporter-richconsole/tests + test-exporter-prometheus-remote-write: pytest {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/tests {posargs} coverage: {toxinidir}/scripts/coverage.sh @@ -970,7 +986,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt @@ -987,7 +1002,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt - pip install -r {toxinidir}/exporter/opentelemetry-exporter-richconsole/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt From 9b0e6c8918cd9c926379d4cd78483e6e7ed0a343 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:05:14 -0500 Subject: [PATCH 28/69] Separate lint for prometheus-remote-write --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index c1cab0971c..4e0434b519 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -44,6 +44,7 @@ jobs: - "instrumentation-jinja2" - "instrumentation-logging" - "exporter-richconsole" + - "exporter-prometheus-remote-write" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 53af662df1..b06066039c 100644 --- a/tox.ini +++ b/tox.ini @@ -166,6 +166,7 @@ envlist = ; opentelemetry-exporter-prometheus-remote-write py3{8,9,10,11}-test-exporter-prometheus-remote-write pypy3-test-exporter-prometheus-remote-write + lint-exporter-prometheus-remote-write ; opentelemetry-instrumentation-mysql py3{8,9,10,11}-test-instrumentation-mysql @@ -932,6 +933,12 @@ commands = lint-exporter-richconsole: pylint {toxinidir}/exporter/opentelemetry-exporter-richconsole/tests test-exporter-prometheus-remote-write: pytest {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/tests {posargs} + lint-exporter-prometheus-remote-write: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write + lint-exporter-prometheus-remote-write: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write + lint-exporter-prometheus-remote-write: flake8 --config {toxinidir}/.flake8 {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write + lint-exporter-prometheus-remote-write: pylint {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry + lint-exporter-prometheus-remote-write: pylint {toxinidir}/exporter/opentelemetry-exporter-prometheus-remote-write/tests + coverage: {toxinidir}/scripts/coverage.sh [testenv:docs] From e017585e0b695197959c3c118ff67320fbb3f4c0 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:06:58 -0500 Subject: [PATCH 29/69] Separate lint for mysql --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 4e0434b519..ca4ff43b51 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -45,6 +45,7 @@ jobs: - "instrumentation-logging" - "exporter-richconsole" - "exporter-prometheus-remote-write" + - "instrumentation-mysql" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index b06066039c..021df5e563 100644 --- a/tox.ini +++ b/tox.ini @@ -171,6 +171,7 @@ envlist = ; opentelemetry-instrumentation-mysql py3{8,9,10,11}-test-instrumentation-mysql pypy3-test-instrumentation-mysql + lint-instrumentation-mysql ; opentelemetry-instrumentation-mysqlclient py3{8,9,10,11}-test-instrumentation-mysqlclient @@ -868,6 +869,12 @@ commands = lint-instrumentation-logging: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/tests test-instrumentation-mysql: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/tests {posargs} + lint-instrumentation-mysql: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql + lint-instrumentation-mysql: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql + lint-instrumentation-mysql: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql + lint-instrumentation-mysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry + lint-instrumentation-mysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/tests + test-instrumentation-mysqlclient: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests {posargs} test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} @@ -1007,7 +1014,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/test-requirements.txt From 9f75eb24c01e567ae909e3955a6276d29012a49a Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:10:09 -0500 Subject: [PATCH 30/69] Separate lint for mysqlclient --- .github/workflows/lint_0.yml | 1 + tox.ini | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index ca4ff43b51..291aa4f191 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -46,6 +46,7 @@ jobs: - "exporter-richconsole" - "exporter-prometheus-remote-write" - "instrumentation-mysql" + - "instrumentation-mysqlclient" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 021df5e563..9ccbe5a258 100644 --- a/tox.ini +++ b/tox.ini @@ -176,6 +176,10 @@ envlist = ; opentelemetry-instrumentation-mysqlclient py3{8,9,10,11}-test-instrumentation-mysqlclient pypy3-test-instrumentation-mysqlclient + ; prerequisite: follow the instructions here + ; https://github.com/PyMySQL/mysqlclient#install + ; for your OS to install the required dependencies + lint-instrumentation-mysqlclient ; opentelemetry-instrumentation-psycopg2 py3{8,9,10,11}-test-instrumentation-psycopg2 @@ -876,6 +880,12 @@ commands = lint-instrumentation-mysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysql/tests test-instrumentation-mysqlclient: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests {posargs} + lint-instrumentation-mysqlclient: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient + lint-instrumentation-mysqlclient: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient + lint-instrumentation-mysqlclient: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient + lint-instrumentation-mysqlclient: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/src/opentelemetry + lint-instrumentation-mysqlclient: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests + test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} test-instrumentation-psycopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests {posargs} @@ -1007,9 +1017,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt - # prerequisite: follow the instructions here https://github.com/PyMySQL/mysqlclient#install - # for your OS to install the required dependencies - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt From 5290650a000cc1cfbd307cf395f07ee1e573a6cb Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:11:56 -0500 Subject: [PATCH 31/69] Separate lint for psycopg2 --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 291aa4f191..431a333a52 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -47,6 +47,7 @@ jobs: - "exporter-prometheus-remote-write" - "instrumentation-mysql" - "instrumentation-mysqlclient" + - "instrumentation-psycopg2" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 9ccbe5a258..1ed48451c8 100644 --- a/tox.ini +++ b/tox.ini @@ -184,6 +184,7 @@ envlist = ; opentelemetry-instrumentation-psycopg2 py3{8,9,10,11}-test-instrumentation-psycopg2 ; ext-psycopg2 intentionally excluded from pypy3 + lint-instrumentation-psycopg2 ; opentelemetry-instrumentation-psycopg py3{8,9,10,11}-test-instrumentation-psycopg @@ -889,7 +890,14 @@ commands = test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} test-instrumentation-aio-pika: 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} + lint-instrumentation-psycopg2: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 + lint-instrumentation-psycopg2: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 + lint-instrumentation-psycopg2: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 + lint-instrumentation-psycopg2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry + lint-instrumentation-psycopg2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests + test-instrumentation-pymemcache: 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} @@ -1010,7 +1018,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt From 4accd3355aa596dd723d9b8bcb745916ee8e539b Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:15:52 -0500 Subject: [PATCH 32/69] Separate lint for psycopg --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 431a333a52..744d4b5037 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -48,6 +48,7 @@ jobs: - "instrumentation-mysql" - "instrumentation-mysqlclient" - "instrumentation-psycopg2" + - "instrumentation-psycopg" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 1ed48451c8..7e98beac0f 100644 --- a/tox.ini +++ b/tox.ini @@ -189,6 +189,7 @@ envlist = ; opentelemetry-instrumentation-psycopg py3{8,9,10,11}-test-instrumentation-psycopg pypy3-test-instrumentation-psycopg + lint-instrumentation-psycopg ; opentelemetry-instrumentation-pymemcache ; The numbers at the end of the environment names @@ -546,6 +547,7 @@ commands_pre = py3{8,9}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-0.txt py3{10,11}-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pypy3-test-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt + lint-instrumentation-psycopg: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt psycopg2: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api psycopg2: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -889,7 +891,13 @@ commands = test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} + test-instrumentation-psycopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests {posargs} + lint-instrumentation-psycopg: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg + lint-instrumentation-psycopg: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg + lint-instrumentation-psycopg: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg + lint-instrumentation-psycopg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/src/opentelemetry + lint-instrumentation-psycopg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests test-instrumentation-psycopg2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests {posargs} lint-instrumentation-psycopg2: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2 @@ -1018,7 +1026,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt From e10676a57f2b273cf31658979df29d70abaad258 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:17:45 -0500 Subject: [PATCH 33/69] Separate lint for pymemcache --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 744d4b5037..8aec4b6dae 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -49,6 +49,7 @@ jobs: - "instrumentation-mysqlclient" - "instrumentation-psycopg2" - "instrumentation-psycopg" + - "instrumentation-pymemcache" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 7e98beac0f..43b40665df 100644 --- a/tox.ini +++ b/tox.ini @@ -201,6 +201,7 @@ envlist = ; 4: pymemcache ==4.0.0 py3{8,9,10,11}-test-instrumentation-pymemcache-{0,1,2,3,4} pypy3-test-instrumentation-pymemcache-{0,1,2,3,4} + lint-instrumentation-pymemcache ; opentelemetry-instrumentation-pymongo py3{8,9,10,11}-test-instrumentation-pymongo @@ -533,6 +534,7 @@ commands_pre = pymemcache-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-2.txt pymemcache-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-3.txt pymemcache-4: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt + lint-instrumentation-pymemcache: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt pymongo: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api pymongo: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -907,6 +909,12 @@ commands = lint-instrumentation-psycopg2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg2/tests test-instrumentation-pymemcache: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/tests {posargs} + lint-instrumentation-pymemcache: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache + lint-instrumentation-pymemcache: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache + lint-instrumentation-pymemcache: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache + lint-instrumentation-pymemcache: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry + lint-instrumentation-pymemcache: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/tests + 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} @@ -1025,7 +1033,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/test-requirements-4.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt From 29159ef5da0c006f9e024c9cfee814b0a4c2684b Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:26:25 -0500 Subject: [PATCH 34/69] Separate lint for pymongo --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 8aec4b6dae..51b77c6022 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -50,6 +50,7 @@ jobs: - "instrumentation-psycopg2" - "instrumentation-psycopg" - "instrumentation-pymemcache" + - "instrumentation-pymongo" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 43b40665df..66ab020284 100644 --- a/tox.ini +++ b/tox.ini @@ -206,6 +206,7 @@ envlist = ; opentelemetry-instrumentation-pymongo py3{8,9,10,11}-test-instrumentation-pymongo pypy3-test-instrumentation-pymongo + lint-instrumentation-pymongo ; opentelemetry-instrumentation-pymysql py3{8,9,10,11}-test-instrumentation-pymysql @@ -916,6 +917,12 @@ commands = lint-instrumentation-pymemcache: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymemcache/tests test-instrumentation-pymongo: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/tests {posargs} + lint-instrumentation-pymongo: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo + lint-instrumentation-pymongo: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo + lint-instrumentation-pymongo: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo + lint-instrumentation-pymongo: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry + lint-instrumentation-pymongo: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/tests + 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} @@ -1040,7 +1047,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt From c43430a4fe1f35a5b07ef561904f931ad32d40f1 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:28:59 -0500 Subject: [PATCH 35/69] Separate lint for pymysql --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 51b77c6022..502e1222a7 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -51,6 +51,7 @@ jobs: - "instrumentation-psycopg" - "instrumentation-pymemcache" - "instrumentation-pymongo" + - "instrumentation-pymysql" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 66ab020284..03c7b118fc 100644 --- a/tox.ini +++ b/tox.ini @@ -211,6 +211,7 @@ envlist = ; opentelemetry-instrumentation-pymysql py3{8,9,10,11}-test-instrumentation-pymysql pypy3-test-instrumentation-pymysql + lint-instrumentation-pymysql ; opentelemetry-instrumentation-pyramid py3{8,9,10,11}-test-instrumentation-pyramid @@ -924,6 +925,12 @@ commands = lint-instrumentation-pymongo: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymongo/tests test-instrumentation-pymysql: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/tests {posargs} + lint-instrumentation-pymysql: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql + lint-instrumentation-pymysql: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql + lint-instrumentation-pymysql: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql + lint-instrumentation-pymysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry + lint-instrumentation-pymysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/tests + 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} @@ -1044,7 +1051,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt From b13faf092dbd880eb1639724d9e400de803ca63e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:33:54 -0500 Subject: [PATCH 36/69] Separate lint for pyramid --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 502e1222a7..d60bf7e58a 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -52,6 +52,7 @@ jobs: - "instrumentation-pymemcache" - "instrumentation-pymongo" - "instrumentation-pymysql" + - "instrumentation-pyramid" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 03c7b118fc..80b7488a6c 100644 --- a/tox.ini +++ b/tox.ini @@ -216,6 +216,7 @@ envlist = ; opentelemetry-instrumentation-pyramid py3{8,9,10,11}-test-instrumentation-pyramid pypy3-test-instrumentation-pyramid + lint-instrumentation-pyramid ; opentelemetry-instrumentation-asgi py3{8,9,10,11}-test-instrumentation-asgi @@ -932,6 +933,12 @@ commands = lint-instrumentation-pymysql: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pymysql/tests test-instrumentation-pyramid: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/tests {posargs} + lint-instrumentation-pyramid: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid + lint-instrumentation-pyramid: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid + lint-instrumentation-pyramid: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid + lint-instrumentation-pyramid: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry + lint-instrumentation-pyramid: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/tests + test-instrumentation-redis: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/tests {posargs} test-instrumentation-remoulade: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/tests {posargs} @@ -1047,7 +1054,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt From 1a04333604b4e0345fc723252fbf13f1cf40ba55 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:39:57 -0500 Subject: [PATCH 37/69] Separate lint for asgi --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index d60bf7e58a..7c5a359df4 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -53,6 +53,7 @@ jobs: - "instrumentation-pymongo" - "instrumentation-pymysql" - "instrumentation-pyramid" + - "instrumentation-asgi" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 80b7488a6c..32c7f7ed14 100644 --- a/tox.ini +++ b/tox.ini @@ -221,6 +221,7 @@ envlist = ; opentelemetry-instrumentation-asgi py3{8,9,10,11}-test-instrumentation-asgi pypy3-test-instrumentation-asgi + lint-instrumentation-asgi ; opentelemetry-instrumentation-asyncpg py3{8,9,10,11}-test-instrumentation-asyncpg @@ -773,6 +774,12 @@ commands = lint-instrumentation-aiopg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aiopg/tests test-instrumentation-asgi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/tests {posargs} + lint-instrumentation-asgi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi + lint-instrumentation-asgi: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi + lint-instrumentation-asgi: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi + lint-instrumentation-asgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry + lint-instrumentation-asgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/tests + test-instrumentation-asyncpg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/tests {posargs} test-instrumentation-aws-lambda: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests {posargs} @@ -1043,7 +1050,6 @@ commands_pre = 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] pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt From af239e2ac1b4c7089a81fc052c67c777dab57e76 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:40:56 -0500 Subject: [PATCH 38/69] Separate lint for asyncpg --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 7c5a359df4..7994c9fe76 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -54,6 +54,7 @@ jobs: - "instrumentation-pymysql" - "instrumentation-pyramid" - "instrumentation-asgi" + - "instrumentation-asyncpg" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 32c7f7ed14..b935ae3b1e 100644 --- a/tox.ini +++ b/tox.ini @@ -226,6 +226,7 @@ envlist = ; opentelemetry-instrumentation-asyncpg py3{8,9,10,11}-test-instrumentation-asyncpg ; ext-asyncpg intentionally excluded from pypy3 + lint-instrumentation-asyncpg ; opentelemetry-instrumentation-sqlite3 py3{8,9,10,11}-test-instrumentation-sqlite3 @@ -781,6 +782,11 @@ commands = lint-instrumentation-asgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asgi/tests test-instrumentation-asyncpg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/tests {posargs} + lint-instrumentation-asyncpg: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg + lint-instrumentation-asyncpg: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg + lint-instrumentation-asyncpg: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg + lint-instrumentation-asyncpg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry + lint-instrumentation-asyncpg: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/tests test-instrumentation-aws-lambda: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda/tests {posargs} lint-instrumentation-aws-lambda: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aws-lambda @@ -1064,7 +1070,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncpg/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt From c0459e6dd8a01475e419357a0be5f65f40dfee0c Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:42:14 -0500 Subject: [PATCH 39/69] Separate lint for sqlite3 --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 7994c9fe76..077a7a407f 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -55,6 +55,7 @@ jobs: - "instrumentation-pyramid" - "instrumentation-asgi" - "instrumentation-asyncpg" + - "instrumentation-sqlite3" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index b935ae3b1e..955b525ed9 100644 --- a/tox.ini +++ b/tox.ini @@ -231,6 +231,7 @@ envlist = ; opentelemetry-instrumentation-sqlite3 py3{8,9,10,11}-test-instrumentation-sqlite3 pypy3-test-instrumentation-sqlite3 + lint-instrumentation-sqlite3 ; opentelemetry-instrumentation-wsgi py3{8,9,10,11}-test-instrumentation-wsgi @@ -964,7 +965,13 @@ commands = test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs} test-instrumentation-sqlalchemy: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs} + test-instrumentation-sqlite3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/tests {posargs} + lint-instrumentation-sqlite3: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3 + lint-instrumentation-sqlite3: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3 + lint-instrumentation-sqlite3: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3 + lint-instrumentation-sqlite3: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry + lint-instrumentation-sqlite3: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/tests test-instrumentation-starlette: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/tests {posargs} lint-instrumentation-starlette: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette @@ -1066,7 +1073,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt From 455e8e664941d509d54923b953b5e50ed62cf617 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:43:29 -0500 Subject: [PATCH 40/69] Separate lint for wsgi --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 077a7a407f..b233de29a2 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -56,6 +56,7 @@ jobs: - "instrumentation-asgi" - "instrumentation-asyncpg" - "instrumentation-sqlite3" + - "instrumentation-wsgi" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 955b525ed9..38d39e0e6e 100644 --- a/tox.ini +++ b/tox.ini @@ -236,6 +236,7 @@ envlist = ; opentelemetry-instrumentation-wsgi py3{8,9,10,11}-test-instrumentation-wsgi pypy3-test-instrumentation-wsgi + lint-instrumentation-wsgi ; opentelemetry-instrumentation-grpc py3{8,9,10,11}-test-instrumentation-grpc @@ -984,7 +985,14 @@ commands = test-instrumentation-threading: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/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} + lint-instrumentation-wsgi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi + lint-instrumentation-wsgi: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi + lint-instrumentation-wsgi: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi + lint-instrumentation-wsgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry + lint-instrumentation-wsgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/tests + test-instrumentation-httpx: 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} @@ -1062,7 +1070,6 @@ commands_pre = 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] - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/test-requirements.txt pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt From c729ac611473f4b1f125ea1b2fb7c25e91eb40e2 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:44:29 -0500 Subject: [PATCH 41/69] Separate lint for grpc --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index b233de29a2..c3b80f54d9 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -57,6 +57,7 @@ jobs: - "instrumentation-asyncpg" - "instrumentation-sqlite3" - "instrumentation-wsgi" + - "instrumentation-grpc" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 38d39e0e6e..3efa160e0c 100644 --- a/tox.ini +++ b/tox.ini @@ -241,6 +241,7 @@ envlist = ; opentelemetry-instrumentation-grpc py3{8,9,10,11}-test-instrumentation-grpc pypy3-test-instrumentation-grpc + lint-instrumentation-grpc ; opentelemetry-instrumentation-sqlalchemy ; The numbers at the end of the environment names @@ -878,6 +879,12 @@ commands = lint-instrumentation-urllib3: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-urllib3/tests test-instrumentation-grpc: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/tests {posargs} + lint-instrumentation-grpc: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc + lint-instrumentation-grpc: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc + lint-instrumentation-grpc: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc + lint-instrumentation-grpc: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry + lint-instrumentation-grpc: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/tests + test-instrumentation-jinja2: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/tests {posargs} lint-instrumentation-jinja2: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2 lint-instrumentation-jinja2: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2 @@ -1071,7 +1078,6 @@ commands_pre = 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] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-grpc/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt From e0892480f59d5098b03869327deeac7c628757e6 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:49:25 -0500 Subject: [PATCH 42/69] Separate lint for sqlalchemy --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index c3b80f54d9..e856885983 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -58,6 +58,7 @@ jobs: - "instrumentation-sqlite3" - "instrumentation-wsgi" - "instrumentation-grpc" + - "instrumentation-sqlalchemy" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 3efa160e0c..d129386fef 100644 --- a/tox.ini +++ b/tox.ini @@ -250,6 +250,7 @@ envlist = ; 1: sqlalchemy~=1.4 aiosqlite py3{8,9,10,11}-test-instrumentation-sqlalchemy-{1} pypy3-test-instrumentation-sqlalchemy-{0,1} + lint-instrumentation-sqlalchemy ; opentelemetry-instrumentation-redis py3{8,9,10,11}-test-instrumentation-redis @@ -685,6 +686,7 @@ commands_pre = sqlalchemy: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils 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 + lint-instrumentation-sqlalchemy: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt elasticsearch: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api elasticsearch: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -972,7 +974,13 @@ commands = lint-instrumentation-requests: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs} + test-instrumentation-sqlalchemy: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs} + lint-instrumentation-sqlalchemy: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy + lint-instrumentation-sqlalchemy: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy + lint-instrumentation-sqlalchemy: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy + lint-instrumentation-sqlalchemy: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry + lint-instrumentation-sqlalchemy: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests test-instrumentation-sqlite3: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3/tests {posargs} lint-instrumentation-sqlite3: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlite3 @@ -1078,7 +1086,6 @@ commands_pre = 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] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt From c4d9bd7d3c69fb559e7912bd2a472ad80124ece9 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:51:02 -0500 Subject: [PATCH 43/69] Separate lint for redis --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index e856885983..2a53615bdc 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -59,6 +59,7 @@ jobs: - "instrumentation-wsgi" - "instrumentation-grpc" - "instrumentation-sqlalchemy" + - "instrumentation-redis" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index d129386fef..8d953eddc3 100644 --- a/tox.ini +++ b/tox.ini @@ -255,6 +255,7 @@ envlist = ; opentelemetry-instrumentation-redis py3{8,9,10,11}-test-instrumentation-redis pypy3-test-instrumentation-redis + lint-instrumentation-redis ; opentelemetry-instrumentation-remoulade py3{8,9,10,11}-test-instrumentation-remoulade @@ -964,6 +965,12 @@ commands = lint-instrumentation-pyramid: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pyramid/tests test-instrumentation-redis: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/tests {posargs} + lint-instrumentation-redis: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-redis + lint-instrumentation-redis: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-redis + lint-instrumentation-redis: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-redis + lint-instrumentation-redis: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry + lint-instrumentation-redis: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/tests + test-instrumentation-remoulade: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/tests {posargs} test-instrumentation-requests: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests {posargs} @@ -1089,7 +1096,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt From 6d0a4fddfbe8c14a76b282343ec5f3a621bac76f Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:52:20 -0500 Subject: [PATCH 44/69] Separate lint for remoulade --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 2a53615bdc..b8436f9796 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -60,6 +60,7 @@ jobs: - "instrumentation-grpc" - "instrumentation-sqlalchemy" - "instrumentation-redis" + - "instrumentation-remoulade" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 8d953eddc3..f09788f6d2 100644 --- a/tox.ini +++ b/tox.ini @@ -260,6 +260,7 @@ envlist = ; opentelemetry-instrumentation-remoulade py3{8,9,10,11}-test-instrumentation-remoulade ; instrumentation-remoulade intentionally excluded from pypy3 + lint-instrumentation-remoulade ; opentelemetry-instrumentation-celery py3{8,9,10,11}-test-instrumentation-celery @@ -972,6 +973,11 @@ commands = lint-instrumentation-redis: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-redis/tests test-instrumentation-remoulade: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/tests {posargs} + lint-instrumentation-remoulade: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade + lint-instrumentation-remoulade: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade + lint-instrumentation-remoulade: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade + lint-instrumentation-remoulade: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry + lint-instrumentation-remoulade: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/tests test-instrumentation-requests: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests {posargs} lint-instrumentation-requests: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-requests @@ -1097,7 +1103,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-remoulade/test-requirements.txt ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt From e03d444bc20e7d4259f5b4f8ab9dedc4e75ce462 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 16:54:53 -0500 Subject: [PATCH 45/69] Separate lint for celery and sklearn --- .github/workflows/lint_0.yml | 2 ++ tox.ini | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index b8436f9796..8797543471 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -61,6 +61,8 @@ jobs: - "instrumentation-sqlalchemy" - "instrumentation-redis" - "instrumentation-remoulade" + - "instrumentation-celery" + - "instrumentation-sklearn" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index f09788f6d2..06077f7190 100644 --- a/tox.ini +++ b/tox.ini @@ -265,9 +265,11 @@ envlist = ; opentelemetry-instrumentation-celery py3{8,9,10,11}-test-instrumentation-celery pypy3-test-instrumentation-celery + lint-instrumentation-celery ; opentelemetry-instrumentation-sklearn py3{8}-test-instrumentation-sklearn + lint-instrumentation-sklearn ; opentelemetry-instrumentation-system-metrics py3{8,9,10,11}-test-instrumentation-system-metrics @@ -394,6 +396,7 @@ commands_pre = py3{8,9}-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-0.txt py3{10,11}-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pypy3-test-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt + lint-instrumentation-celery: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt sio-pika: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api sio-pika: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -824,7 +827,13 @@ commands = lint-instrumentation-boto3sqs: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/tests test-instrumentation-cassandra: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/tests {posargs} + test-instrumentation-celery: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/tests {posargs} + lint-instrumentation-celery: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-celery + lint-instrumentation-celery: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-celery + lint-instrumentation-celery: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-celery + lint-instrumentation-celery: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry + lint-instrumentation-celery: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/tests test-instrumentation-dbapi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi/tests {posargs} lint-instrumentation-dbapi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-dbapi @@ -987,6 +996,11 @@ commands = lint-instrumentation-requests: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-requests/tests test-instrumentation-sklearn: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests {posargs} + lint-instrumentation-sklearn: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn + lint-instrumentation-sklearn: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn + lint-instrumentation-sklearn: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn + lint-instrumentation-sklearn: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry + lint-instrumentation-sklearn: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/tests test-instrumentation-sqlalchemy: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy/tests {posargs} lint-instrumentation-sqlalchemy: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sqlalchemy @@ -1100,10 +1114,8 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt - ; pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-sklearn/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt From 6a53158c4a6b2b116f88ed06aea8eb5e0b603863 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:03:03 -0500 Subject: [PATCH 46/69] Separate lint for system-metrics --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 8797543471..8eaddfcc74 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -63,6 +63,7 @@ jobs: - "instrumentation-remoulade" - "instrumentation-celery" - "instrumentation-sklearn" + - "instrumentation-system-metrics" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 06077f7190..597c08ca96 100644 --- a/tox.ini +++ b/tox.ini @@ -274,6 +274,7 @@ envlist = ; opentelemetry-instrumentation-system-metrics py3{8,9,10,11}-test-instrumentation-system-metrics pypy3-test-instrumentation-system-metrics + lint-instrumentation-system-metrics ; opentelemetry-instrumentation-threading py3{8,9,10,11}-test-instrumentation-threading @@ -1024,6 +1025,12 @@ commands = lint-instrumentation-starlette: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-starlette/tests test-instrumentation-system-metrics: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/tests {posargs} + lint-instrumentation-system-metrics: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics + lint-instrumentation-system-metrics: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics + lint-instrumentation-system-metrics: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics + lint-instrumentation-system-metrics: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry + lint-instrumentation-system-metrics: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/tests + test-instrumentation-threading: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/tests {posargs} test-instrumentation-tornado: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests {posargs} test-instrumentation-tortoiseorm: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests {posargs} @@ -1121,7 +1128,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt # requires snappy headers to be available on the system From fac12f579547dd3833b9c13d02a271b61bca4960 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:04:09 -0500 Subject: [PATCH 47/69] Separate lint for threading --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 8eaddfcc74..dc65d062eb 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -64,6 +64,7 @@ jobs: - "instrumentation-celery" - "instrumentation-sklearn" - "instrumentation-system-metrics" + - "instrumentation-threading" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 597c08ca96..e5031fa4ab 100644 --- a/tox.ini +++ b/tox.ini @@ -279,6 +279,7 @@ envlist = ; opentelemetry-instrumentation-threading py3{8,9,10,11}-test-instrumentation-threading pypy3-test-instrumentation-threading + lint-instrumentation-threading ; opentelemetry-instrumentation-tornado py3{8,9,10,11}-test-instrumentation-tornado @@ -1032,6 +1033,12 @@ commands = lint-instrumentation-system-metrics: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-system-metrics/tests test-instrumentation-threading: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/tests {posargs} + lint-instrumentation-threading: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-threading + lint-instrumentation-threading: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-threading + lint-instrumentation-threading: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-threading + lint-instrumentation-threading: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/src/opentelemetry + lint-instrumentation-threading: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/tests + test-instrumentation-tornado: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests {posargs} test-instrumentation-tortoiseorm: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests {posargs} @@ -1128,7 +1135,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt From 4986b23954b5f1b236f2f1d2adbae8fb6ea924fc Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:05:09 -0500 Subject: [PATCH 48/69] Separate lint for tornado --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index dc65d062eb..e4796b4fed 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -65,6 +65,7 @@ jobs: - "instrumentation-sklearn" - "instrumentation-system-metrics" - "instrumentation-threading" + - "instrumentation-tornado" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index e5031fa4ab..dca65df277 100644 --- a/tox.ini +++ b/tox.ini @@ -284,6 +284,7 @@ envlist = ; opentelemetry-instrumentation-tornado py3{8,9,10,11}-test-instrumentation-tornado pypy3-test-instrumentation-tornado + lint-instrumentation-tornado ; opentelemetry-instrumentation-tortoiseorm py3{8,9,10,11}-test-instrumentation-tortoiseorm @@ -1040,6 +1041,12 @@ commands = lint-instrumentation-threading: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-threading/tests test-instrumentation-tornado: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests {posargs} + lint-instrumentation-tornado: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado + lint-instrumentation-tornado: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado + lint-instrumentation-tornado: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado + lint-instrumentation-tornado: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry + lint-instrumentation-tornado: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests + test-instrumentation-tortoiseorm: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests {posargs} test-instrumentation-wsgi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/tests {posargs} @@ -1132,7 +1139,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt From 3d1c387ffe02226274c5f9c1ec0e27b2b27bb971 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:06:10 -0500 Subject: [PATCH 49/69] Separate lint for tortoiseorm --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index e4796b4fed..e12ac31ae9 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -66,6 +66,7 @@ jobs: - "instrumentation-system-metrics" - "instrumentation-threading" - "instrumentation-tornado" + - "instrumentation-tortoiseorm" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index dca65df277..24b8cfeb70 100644 --- a/tox.ini +++ b/tox.ini @@ -289,6 +289,7 @@ envlist = ; opentelemetry-instrumentation-tortoiseorm py3{8,9,10,11}-test-instrumentation-tortoiseorm pypy3-test-instrumentation-tortoiseorm + lint-instrumentation-tortoiseorm ; opentelemetry-instrumentation-httpx ; The numbers at the end of the environment names @@ -1048,6 +1049,11 @@ commands = lint-instrumentation-tornado: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-tornado/tests test-instrumentation-tortoiseorm: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests {posargs} + lint-instrumentation-tortoiseorm: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm + lint-instrumentation-tortoiseorm: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm + lint-instrumentation-tortoiseorm: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm + lint-instrumentation-tortoiseorm: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/src/opentelemetry + lint-instrumentation-tortoiseorm: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/tests test-instrumentation-wsgi: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/tests {posargs} lint-instrumentation-wsgi: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi @@ -1141,7 +1147,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-tortoiseorm/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt From 1df66dd5ce0c73e2ba40b912ae699b865f782d0e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:08:16 -0500 Subject: [PATCH 50/69] Separate lint for httpx --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index e12ac31ae9..7c6f8c8a19 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -67,6 +67,7 @@ jobs: - "instrumentation-threading" - "instrumentation-tornado" - "instrumentation-tortoiseorm" + - "instrumentation-httpx" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 24b8cfeb70..6d2581b0ab 100644 --- a/tox.ini +++ b/tox.ini @@ -298,6 +298,7 @@ envlist = ; 1: httpx>=0.19.0 respx~=0.20.1 py3{8,9,10,11}-test-instrumentation-httpx-{0,1} pypy3-test-instrumentation-httpx-{0,1} + lint-instrumentation-httpx ; opentelemetry-util-http py3{8,9,10,11}-test-util-http @@ -716,6 +717,7 @@ commands_pre = httpx: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils httpx-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-0.txt httpx-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt + lint-instrumentation-httpx: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt sdk-extension-aws: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api sdk-extension-aws: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -1063,6 +1065,12 @@ commands = lint-instrumentation-wsgi: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-wsgi/tests test-instrumentation-httpx: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests {posargs} + lint-instrumentation-httpx: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx + lint-instrumentation-httpx: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx + lint-instrumentation-httpx: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx + lint-instrumentation-httpx: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry + lint-instrumentation-httpx: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests + test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs} test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs} @@ -1145,7 +1153,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt From 893e1259c942c117b74d3013ea40d69c40ffe0e3 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:15:52 -0500 Subject: [PATCH 51/69] Separate lint for propagator-aws-xray --- .github/workflows/lint_0.yml | 1 + tox.ini | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 7c6f8c8a19..09ccf2aa6c 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -68,6 +68,7 @@ jobs: - "instrumentation-tornado" - "instrumentation-tortoiseorm" - "instrumentation-httpx" + - "propagator-aws-xray" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 6d2581b0ab..d87c79ab52 100644 --- a/tox.ini +++ b/tox.ini @@ -307,6 +307,7 @@ envlist = ; opentelemetry-propagator-aws-xray py3{8,9,10,11}-test-propagator-aws-xray pypy3-test-propagator-aws-xray + lint-propagator-aws-xray ; opentelemetry-propagator-ot-trace py3{8,9,10,11}-test-propagator-ot-trace @@ -1089,7 +1090,14 @@ commands = lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/tests test-processor-baggage: pytest {toxinidir}/processor/opentelemetry-processor-baggage/tests {posargs} - test-propagator-aws: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs} + + test-propagator-aws-xray: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs} + lint-propagator-aws-xray: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/propagator/opentelemetry-propagator-aws-xray + lint-propagator-aws-xray: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/propagator/opentelemetry-propagator-aws-xray + lint-propagator-aws-xray: flake8 --config {toxinidir}/.flake8 {toxinidir}/propagator/opentelemetry-propagator-aws-xray + lint-propagator-aws-xray: pylint {toxinidir}/propagator/opentelemetry-propagator-aws-xray/src/opentelemetry + lint-propagator-aws-xray: pylint {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests + test-propagator-ot-trace: pytest {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests {posargs} test-exporter-richconsole: pytest {toxinidir}/exporter/opentelemetry-exporter-richconsole/tests {posargs} @@ -1156,7 +1164,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt - pip install -r {toxinidir}/propagator/opentelemetry-propagator-aws-xray/test-requirements.txt pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt commands = From 983a3de3a9be9ed4edaf6bfd2e2722bb8c93b9f1 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:19:11 -0500 Subject: [PATCH 52/69] Remove lint --- .github/workflows/test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5647f34998..a129c6e7ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - tox-environment: [ "docker-tests", "spellcheck", "lint", "docs", "generate" ] + tox-environment: [ "docker-tests", "spellcheck", "docs", "generate" ] name: ${{ matrix.tox-environment }} runs-on: ubuntu-20.04 steps: @@ -25,9 +25,6 @@ jobs: python-version: "3.10" - name: Install tox run: pip install tox - - name: Install libsnappy-dev - if: ${{ matrix.tox-environment == 'lint' }} - run: sudo apt-get install -y libsnappy-dev - name: Cache tox environment # Preserves .tox directory between runs for faster installs uses: actions/cache@v4 From e0c90ae97036f505a2011fa96c70d0d02410c733 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:20:59 -0500 Subject: [PATCH 53/69] Separate lint for propagator-ot-trace --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 09ccf2aa6c..ebe9c56059 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -69,6 +69,7 @@ jobs: - "instrumentation-tortoiseorm" - "instrumentation-httpx" - "propagator-aws-xray" + - "propagator-ot-trace" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index d87c79ab52..02893ff448 100644 --- a/tox.ini +++ b/tox.ini @@ -312,6 +312,7 @@ envlist = ; opentelemetry-propagator-ot-trace py3{8,9,10,11}-test-propagator-ot-trace pypy3-test-propagator-ot-trace + lint-propagator-ot-trace ; opentelemetry-instrumentation-sio-pika ; The numbers at the end of the environment names @@ -1099,6 +1100,11 @@ commands = lint-propagator-aws-xray: pylint {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests test-propagator-ot-trace: pytest {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests {posargs} + lint-propagator-ot-trace: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/propagator/opentelemetry-propagator-ot-trace + lint-propagator-ot-trace: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/propagator/opentelemetry-propagator-ot-trace + lint-propagator-ot-trace: flake8 --config {toxinidir}/.flake8 {toxinidir}/propagator/opentelemetry-propagator-ot-trace + lint-propagator-ot-trace: pylint {toxinidir}/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry + lint-propagator-ot-trace: pylint {toxinidir}/propagator/opentelemetry-propagator-ot-trace/tests test-exporter-richconsole: pytest {toxinidir}/exporter/opentelemetry-exporter-richconsole/tests {posargs} lint-exporter-richconsole: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/exporter/opentelemetry-exporter-richconsole @@ -1164,7 +1170,6 @@ commands_pre = pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt - pip install -r {toxinidir}/propagator/opentelemetry-propagator-ot-trace/test-requirements.txt commands = python scripts/eachdist.py lint --check-only From f3e8a9d2bf300a3853ed776206525df058180fe4 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:23:07 -0500 Subject: [PATCH 54/69] Separate lint for sio-pika --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index ebe9c56059..15e9f5e9a7 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -70,6 +70,7 @@ jobs: - "instrumentation-httpx" - "propagator-aws-xray" - "propagator-ot-trace" + - "instrumentation-sio-pika" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 02893ff448..167ee4c13a 100644 --- a/tox.ini +++ b/tox.ini @@ -321,6 +321,7 @@ envlist = ; 1: pika>=1.0.0 py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1} pypy3-test-instrumentation-sio-pika-{0,1} + lint-propagator-sio-pika ; opentelemetry-instrumentation-aio-pika ; The numbers at the end of the environment names @@ -410,6 +411,7 @@ commands_pre = sio-pika: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk sio-pika-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-0.txt sio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt + lint-instrumentation-sio-pika: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt aio-pika: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api aio-pika: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -938,6 +940,12 @@ commands = lint-instrumentation-mysqlclient: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} + lint-instrumentation-sio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika + lint-instrumentation-sio-pika: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika + lint-instrumentation-sio-pika: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika + lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika/src/opentelemetry + lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika/tests + test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} test-instrumentation-psycopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests {posargs} From 7f8e71adf96467c2096ef21ee4c953b9502af0c7 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:24:39 -0500 Subject: [PATCH 55/69] Separate lint for aio-pika --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 15e9f5e9a7..93af5f83b5 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -71,6 +71,7 @@ jobs: - "propagator-aws-xray" - "propagator-ot-trace" - "instrumentation-sio-pika" + - "instrumentation-aio-pika" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 167ee4c13a..a5841b386c 100644 --- a/tox.ini +++ b/tox.ini @@ -332,6 +332,7 @@ envlist = ; 3: aio_pika==9.4.1 py3{8,9,10,11}-test-instrumentation-aio-pika-{0,1,2,3} pypy3-test-instrumentation-aio-pika-{0,1,2,3} + lint-propagator-aio-pika ; opentelemetry-instrumentation-kafka-python py3{8,9,10,11}-test-instrumentation-kafka-python @@ -420,6 +421,7 @@ commands_pre = aio-pika-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-1.txt aio-pika-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt aio-pika-3: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt + lint-instrumentation-aio-pika: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-3.txt kafka-python: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api kafka-python: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions @@ -947,6 +949,11 @@ commands = lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika/tests test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} + lint-instrumentation-aio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika + lint-instrumentation-aio-pika: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika + lint-instrumentation-aio-pika: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika + lint-instrumentation-aio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry + lint-instrumentation-aio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests test-instrumentation-psycopg: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg/tests {posargs} lint-instrumentation-psycopg: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-psycopg @@ -1171,7 +1178,6 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/test-requirements-2.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt From f2cd9ddd6d7f0e322d7f27d09ec95444f46cb626 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:26:31 -0500 Subject: [PATCH 56/69] Fix aio and sio pika --- tox.ini | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index a5841b386c..a664902832 100644 --- a/tox.ini +++ b/tox.ini @@ -321,7 +321,7 @@ envlist = ; 1: pika>=1.0.0 py3{8,9,10,11}-test-instrumentation-sio-pika-{0,1} pypy3-test-instrumentation-sio-pika-{0,1} - lint-propagator-sio-pika + lint-instrumentation-sio-pika ; opentelemetry-instrumentation-aio-pika ; The numbers at the end of the environment names @@ -332,11 +332,12 @@ envlist = ; 3: aio_pika==9.4.1 py3{8,9,10,11}-test-instrumentation-aio-pika-{0,1,2,3} pypy3-test-instrumentation-aio-pika-{0,1,2,3} - lint-propagator-aio-pika + lint-instrumentation-aio-pika ; opentelemetry-instrumentation-kafka-python py3{8,9,10,11}-test-instrumentation-kafka-python pypy3-test-instrumentation-kafka-python + lint-instrumentation-kafka-python ; opentelemetry-instrumentation-confluent-kafka py3{8,9,10,11}-test-instrumentation-confluent-kafka From 6894d1095c375ed5f5de12d4a569175a88eed46b Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:28:41 -0500 Subject: [PATCH 57/69] Separate lint for kafka-python --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 93af5f83b5..e3e9a522cd 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -72,6 +72,7 @@ jobs: - "propagator-ot-trace" - "instrumentation-sio-pika" - "instrumentation-aio-pika" + - "instrumentation-kafka-python" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index a664902832..aa2892b648 100644 --- a/tox.ini +++ b/tox.ini @@ -919,6 +919,12 @@ commands = lint-instrumentation-jinja2: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-jinja2/tests test-instrumentation-kafka-python: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/tests {posargs} + lint-instrumentation-kafka-python: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python + lint-instrumentation-kafka-python: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python + lint-instrumentation-kafka-python: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python + lint-instrumentation-kafka-python: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/src/opentelemetry + lint-instrumentation-kafka-python: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/tests + test-instrumentation-confluent-kafka: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/tests {posargs} test-instrumentation-logging: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/tests {posargs} @@ -1179,7 +1185,6 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt From 713c6a5ac9bf273121ee65018fcd348502897a2d Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:30:18 -0500 Subject: [PATCH 58/69] Separate lint for confluent-kafka --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index e3e9a522cd..319b17436f 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -73,6 +73,7 @@ jobs: - "instrumentation-sio-pika" - "instrumentation-aio-pika" - "instrumentation-kafka-python" + - "instrumentation-confluent-kafka" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index aa2892b648..163f9f4f57 100644 --- a/tox.ini +++ b/tox.ini @@ -342,6 +342,7 @@ envlist = ; opentelemetry-instrumentation-confluent-kafka py3{8,9,10,11}-test-instrumentation-confluent-kafka pypy3-test-instrumentation-confluent-kafka + lint-instrumentation-confluent-kafka ; opentelemetry-instrumentation-asyncio py3{8,9,10,11}-test-instrumentation-asyncio @@ -926,6 +927,11 @@ commands = lint-instrumentation-kafka-python: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-kafka-python/tests test-instrumentation-confluent-kafka: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/tests {posargs} + lint-instrumentation-confluent-kafka: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka + lint-instrumentation-confluent-kafka: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka + lint-instrumentation-confluent-kafka: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka + lint-instrumentation-confluent-kafka: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry + lint-instrumentation-confluent-kafka: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/tests test-instrumentation-logging: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-logging/tests {posargs} lint-instrumentation-logging: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-logging @@ -1185,7 +1191,6 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-confluent-kafka/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt # requires snappy headers to be available on the system From 979f961f145b508f7107d59680056e73cc174e62 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:32:10 -0500 Subject: [PATCH 59/69] Separate lint for asyncio --- .github/workflows/lint_0.yml | 1 + tox.ini | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 319b17436f..77803942c8 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -74,6 +74,7 @@ jobs: - "instrumentation-aio-pika" - "instrumentation-kafka-python" - "instrumentation-confluent-kafka" + - "instrumentation-asyncio" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index 163f9f4f57..ccbab879b4 100644 --- a/tox.ini +++ b/tox.ini @@ -346,6 +346,7 @@ envlist = ; opentelemetry-instrumentation-asyncio py3{8,9,10,11}-test-instrumentation-asyncio + lint-instrumentation-asyncio ; opentelemetry-instrumentation-cassandra py3{8,9,10,11}-test-instrumentation-cassandra @@ -1102,6 +1103,12 @@ commands = lint-instrumentation-httpx: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-httpx/tests test-instrumentation-asyncio: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests {posargs} + lint-instrumentation-asyncio: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio + lint-instrumentation-asyncio: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio + lint-instrumentation-asyncio: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio + lint-instrumentation-asyncio: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry + lint-instrumentation-asyncio: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests + test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs} test-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs} @@ -1192,7 +1199,6 @@ commands_pre = pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/test-requirements.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt From c5ae6a701bbe066fbc56f432673799dc9f5a1794 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:33:18 -0500 Subject: [PATCH 60/69] Separate lint for cassandra --- .github/workflows/lint_0.yml | 1 + tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index 77803942c8..f78211aec3 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -75,6 +75,7 @@ jobs: - "instrumentation-kafka-python" - "instrumentation-confluent-kafka" - "instrumentation-asyncio" + - "instrumentation-cassandra" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index ccbab879b4..f7e6246613 100644 --- a/tox.ini +++ b/tox.ini @@ -351,6 +351,7 @@ envlist = ; opentelemetry-instrumentation-cassandra py3{8,9,10,11}-test-instrumentation-cassandra pypy3-test-instrumentation-cassandra + lint-instrumentation-cassandra ; opentelemetry-processor-baggage py3{8,9,10,11}-test-processor-baggage @@ -842,6 +843,11 @@ commands = lint-instrumentation-boto3sqs: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-boto3sqs/tests test-instrumentation-cassandra: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/tests {posargs} + lint-instrumentation-cassandra: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra + lint-instrumentation-cassandra: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra + lint-instrumentation-cassandra: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra + lint-instrumentation-cassandra: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry + lint-instrumentation-cassandra: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/tests test-instrumentation-celery: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-celery/tests {posargs} lint-instrumentation-celery: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-celery @@ -1197,7 +1203,6 @@ commands_pre = 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] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-cassandra/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt # requires snappy headers to be available on the system pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt From f94d44e679536cecdfa2f9d9b639437b0275591b Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:37:03 -0500 Subject: [PATCH 61/69] Separate lint for processor-baggage --- .github/workflows/lint_0.yml | 1 + tox.ini | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index f78211aec3..a15e4316c6 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -76,6 +76,7 @@ jobs: - "instrumentation-confluent-kafka" - "instrumentation-asyncio" - "instrumentation-cassandra" + - "processor-baggage" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: diff --git a/tox.ini b/tox.ini index f7e6246613..a95b1d1b32 100644 --- a/tox.ini +++ b/tox.ini @@ -356,6 +356,8 @@ envlist = ; opentelemetry-processor-baggage py3{8,9,10,11}-test-processor-baggage pypy3-test-processor-baggage + ; requires snappy headers to be available on the system + lint-processor-baggage lint spellcheck @@ -1132,6 +1134,11 @@ commands = lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/tests test-processor-baggage: pytest {toxinidir}/processor/opentelemetry-processor-baggage/tests {posargs} + lint-processor-baggage: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/processor/opentelemetry-processor-baggage + lint-processor-baggage: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/processor/opentelemetry-processor-baggage + lint-processor-baggage: flake8 --config {toxinidir}/.flake8 {toxinidir}/processor/opentelemetry-processor-baggage + lint-processor-baggage: pylint {toxinidir}/processor/opentelemetry-processor-baggage/src/opentelemetry + lint-processor-baggage: pylint {toxinidir}/processor/opentelemetry-processor-baggage/tests test-propagator-aws-xray: pytest {toxinidir}/propagator/opentelemetry-propagator-aws-xray/tests {posargs} lint-propagator-aws-xray: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/propagator/opentelemetry-propagator-aws-xray @@ -1204,8 +1211,6 @@ commands_pre = python -m pip install -e {toxinidir}/util/opentelemetry-util-http[test] pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - # requires snappy headers to be available on the system - pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt commands = python scripts/eachdist.py lint --check-only From 6f444cfc94930e7e77527bf5272fb07b81771059 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:39:43 -0500 Subject: [PATCH 62/69] Remove lint test environment --- tox.ini | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tox.ini b/tox.ini index a95b1d1b32..af0eddd114 100644 --- a/tox.ini +++ b/tox.ini @@ -1197,24 +1197,6 @@ deps = commands = codespell -[testenv:lint] -basepython: python3 -recreate = True -deps = - -r dev-requirements.txt - -commands_pre = - python -m pip install {env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api - 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] - pip install -r {toxinidir}/opentelemetry-instrumentation/test-requirements.txt - pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/test-requirements-1.txt - -commands = - python scripts/eachdist.py lint --check-only - [testenv:docker-tests] basepython: python3 deps = From 075567fe2ce8a20c3742e1adc09913b709bf6e3f Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:42:45 -0500 Subject: [PATCH 63/69] Rename lint workflow file --- .github/workflows/{lint_0.yml => lint.yml} | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) rename .github/workflows/{lint_0.yml => lint.yml} (86%) diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint.yml similarity index 86% rename from .github/workflows/lint_0.yml rename to .github/workflows/lint.yml index a15e4316c6..cba41f33aa 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint.yml @@ -9,17 +9,11 @@ env: CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2 jobs: - lint-0: + lint: strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: package: - # Do not add more instrumentations here, add them in lint_1.yml. - # The reason for this separation of instrumentations into more than one YAML file is - # the limit of jobs that can be run from a Github actions matrix: - # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs - # "A matrix will generate a maximum of 256 jobs per workflow run. This limit applies - # to both GitHub-hosted and self-hosted runners." - "instrumentation-flask" - "resource-detector-container" - "sdk-extension-aws" From 96424c79d18a366f18cd84ebc35e13881bec0f54 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 17:58:34 -0500 Subject: [PATCH 64/69] Fix sio-pika lint testing package path --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index af0eddd114..718844188e 100644 --- a/tox.ini +++ b/tox.ini @@ -964,11 +964,11 @@ commands = lint-instrumentation-mysqlclient: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-mysqlclient/tests test-instrumentation-sio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests {posargs} - lint-instrumentation-sio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika - lint-instrumentation-sio-pika: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika - lint-instrumentation-sio-pika: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika - lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika/src/opentelemetry - lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-sio-pika/tests + lint-instrumentation-sio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-pika + lint-instrumentation-sio-pika: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/instrumentation/opentelemetry-instrumentation-pika + lint-instrumentation-sio-pika: flake8 --config {toxinidir}/.flake8 {toxinidir}/instrumentation/opentelemetry-instrumentation-pika + lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry + lint-instrumentation-sio-pika: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-pika/tests test-instrumentation-aio-pika: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika/tests {posargs} lint-instrumentation-aio-pika: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aio-pika From 1e8bee4f4999093a5a2b4e104b8a5ab323623d5e Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 26 Apr 2024 18:05:46 -0500 Subject: [PATCH 65/69] More fixes --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 718844188e..6f7bf8d8aa 100644 --- a/tox.ini +++ b/tox.ini @@ -359,7 +359,6 @@ envlist = ; requires snappy headers to be available on the system lint-processor-baggage - lint spellcheck docker-tests docs @@ -491,7 +490,8 @@ commands_pre = flask: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils flask-0: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-0.txt flask-1: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-1.txt - flask-2, lint-instrumentation-flask: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt + flask-2: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt + lint-instrumentation-flask: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-flask/test-requirements-2.txt urllib: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api urllib: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions From de9542695699cd744ae90ba5760d58f9c833c385 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 27 Apr 2024 17:04:49 -0500 Subject: [PATCH 66/69] Fix linting for opentelemetry-instrumentation --- tox.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index 6f7bf8d8aa..3fa8e1ec48 100644 --- a/tox.ini +++ b/tox.ini @@ -775,11 +775,11 @@ commands = lint-distro: pylint {toxinidir}/opentelemetry-distro/tests test-opentelemetry-instrumentation: pytest {toxinidir}/opentelemetry-instrumentation/tests {posargs} - lint-instrumentation: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-instrumentation - lint-instrumentation: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-instrumentation - lint-instrumentation: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-instrumentation - lint-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/src/opentelemetry - lint-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/tests + lint-opentelemetry-instrumentation: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/opentelemetry-instrumentation + lint-opentelemetry-instrumentation: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/opentelemetry-instrumentation + lint-opentelemetry-instrumentation: flake8 --config {toxinidir}/.flake8 {toxinidir}/opentelemetry-instrumentation + lint-opentelemetry-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/src/opentelemetry + lint-opentelemetry-instrumentation: pylint {toxinidir}/opentelemetry-instrumentation/tests test-instrumentation-aiohttp-client: pytest {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client/tests {posargs} lint-instrumentation-aiohttp-client: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/instrumentation/opentelemetry-instrumentation-aiohttp-client From a55e1c724846e80df01241ea13ed697dfd8c1119 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sat, 27 Apr 2024 17:21:24 -0500 Subject: [PATCH 67/69] Add section for linting with 3.8 --- .github/workflows/lint.yml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cba41f33aa..686180d390 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,7 +9,7 @@ env: CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2 jobs: - lint: + lint-3_11: strategy: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: @@ -56,7 +56,6 @@ jobs: - "instrumentation-redis" - "instrumentation-remoulade" - "instrumentation-celery" - - "instrumentation-sklearn" - "instrumentation-system-metrics" - "instrumentation-threading" - "instrumentation-tornado" @@ -92,3 +91,31 @@ jobs: key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }} - name: run tox run: tox -e lint-${{ matrix.package }} + + lint-3_8: + strategy: + fail-fast: false # ensures the entire test matrix is run, even if one permutation fails + matrix: + package: + - "instrumentation-sklearn" + os: [ubuntu-20.04] + runs-on: ubuntu-20.04 + steps: + - name: Checkout Contrib Repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: 3.8 + - name: Install tox + run: pip install tox + - name: Cache tox environment + # Preserves .tox directory between runs for faster installs + uses: actions/cache@v4 + with: + path: | + .tox + ~/.cache/pip + key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }} + - name: run tox + run: tox -e lint-${{ matrix.package }} From 84cee0ac083e274ec84fdbc0682b99221c3d71e3 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Sun, 28 Apr 2024 09:27:08 -0500 Subject: [PATCH 68/69] Add missing lint install command for elasticsearch --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 3fa8e1ec48..ed74e485cd 100644 --- a/tox.ini +++ b/tox.ini @@ -716,6 +716,7 @@ commands_pre = elasticsearch: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils 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 + lint-instrumentation-elasticsearch: pip install -r {toxinidir}/instrumentation/opentelemetry-instrumentation-elasticsearch/test-requirements-1.txt asyncio: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api asyncio: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions From e1948e4edc45f57d9e487b305867cc600f5fa4d6 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Tue, 30 Apr 2024 08:51:37 -0500 Subject: [PATCH 69/69] Sorted packages --- .github/workflows/lint.yml | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 686180d390..39afb3ee96 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,62 +14,62 @@ jobs: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: package: - - "instrumentation-flask" - - "resource-detector-container" - - "sdk-extension-aws" - "distro" - - "opentelemetry-instrumentation" + - "exporter-prometheus-remote-write" + - "exporter-richconsole" + - "instrumentation-aio-pika" - "instrumentation-aiohttp-client" - "instrumentation-aiohttp-server" - "instrumentation-aiopg" + - "instrumentation-asgi" + - "instrumentation-asyncio" + - "instrumentation-asyncpg" - "instrumentation-aws-lambda" - - "instrumentation-botocore" + - "instrumentation-boto" - "instrumentation-boto3sqs" - - "instrumentation-django" + - "instrumentation-botocore" + - "instrumentation-cassandra" + - "instrumentation-celery" + - "instrumentation-confluent-kafka" - "instrumentation-dbapi" - - "instrumentation-boto" + - "instrumentation-django" - "instrumentation-elasticsearch" - "instrumentation-falcon" - "instrumentation-fastapi" - - "instrumentation-urllib" - - "instrumentation-urllib3" - - "instrumentation-requests" - - "instrumentation-starlette" + - "instrumentation-flask" + - "instrumentation-grpc" + - "instrumentation-httpx" - "instrumentation-jinja2" + - "instrumentation-kafka-python" - "instrumentation-logging" - - "exporter-richconsole" - - "exporter-prometheus-remote-write" - "instrumentation-mysql" - "instrumentation-mysqlclient" - - "instrumentation-psycopg2" - "instrumentation-psycopg" + - "instrumentation-psycopg2" - "instrumentation-pymemcache" - "instrumentation-pymongo" - "instrumentation-pymysql" - "instrumentation-pyramid" - - "instrumentation-asgi" - - "instrumentation-asyncpg" - - "instrumentation-sqlite3" - - "instrumentation-wsgi" - - "instrumentation-grpc" - - "instrumentation-sqlalchemy" - "instrumentation-redis" - "instrumentation-remoulade" - - "instrumentation-celery" + - "instrumentation-requests" + - "instrumentation-sio-pika" + - "instrumentation-sqlalchemy" + - "instrumentation-sqlite3" + - "instrumentation-starlette" - "instrumentation-system-metrics" - "instrumentation-threading" - "instrumentation-tornado" - "instrumentation-tortoiseorm" - - "instrumentation-httpx" + - "instrumentation-urllib" + - "instrumentation-urllib3" + - "instrumentation-wsgi" + - "opentelemetry-instrumentation" + - "processor-baggage" - "propagator-aws-xray" - "propagator-ot-trace" - - "instrumentation-sio-pika" - - "instrumentation-aio-pika" - - "instrumentation-kafka-python" - - "instrumentation-confluent-kafka" - - "instrumentation-asyncio" - - "instrumentation-cassandra" - - "processor-baggage" + - "resource-detector-container" + - "sdk-extension-aws" os: [ubuntu-20.04] runs-on: ubuntu-20.04 steps: