Seaparate lint for logging and richconsole

open-telemetry · Apr 26, 2024 · cf0382c · cf0382c
1 parent 5c19a68
commit cf0382c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git 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
@@ -153,10 +153,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
@@ -852,7 +854,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}
@@ -910,7 +919,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
 
@@ -966,7 +982,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
@@ -983,7 +998,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