add opentelemetry-util-http to CI

open-telemetry · Jul 2, 2024 · 45bf48d · 45bf48d
1 parent 9021148
commit 45bf48d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/instrumentations_1.yml b/.github/workflows/instrumentations_1.yml
@@ -36,6 +36,7 @@ jobs:
           - "propagator-aws-xray"
           - "propagator-ot-trace"
           - "resource-detector-container"
+          - "util-http"
         os: [ubuntu-20.04]
         exclude:
           - python-version: pypy3

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -70,6 +70,7 @@ jobs:
           - "propagator-ot-trace"
           - "resource-detector-container"
           - "sdk-extension-aws"
+          - "util-http"
         os: [ubuntu-20.04]
     runs-on: ubuntu-20.04
     steps:

diff --git a/tox.ini b/tox.ini
@@ -303,6 +303,7 @@ envlist =
     ; opentelemetry-util-http
     py3{8,9,10,11,12}-test-util-http
     pypy3-test-util-http
+    lint-util-http
 
     ; opentelemetry-propagator-aws-xray
     py3{8,9,10,11,12}-test-propagator-aws-xray
@@ -761,12 +762,12 @@ commands_pre =
   processor-baggage: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   processor-baggage: pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt
 
-  http: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
-  http: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
-  http: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
-  http: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  http: pip install -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
-  http: pip install {toxinidir}/util/opentelemetry-util-http
+  util-http: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  util-http: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  util-http: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  util-http: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  util-http: pip install -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
+  util-http: pip install {toxinidir}/util/opentelemetry-util-http
 
 ; In order to get a health coverage report,
 ; we have to install packages in editable mode.
@@ -1124,6 +1125,11 @@ commands =
   lint-instrumentation-asyncio: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests
 
   test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
+  lint-util-http: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/util/opentelemetry-util-http
+  lint-util-http: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/util/opentelemetry-util-http
+  lint-util-http: flake8 --config {toxinidir}/.flake8 {toxinidir}/util/opentelemetry-util-http
+  lint-util-http: pylint {toxinidir}/util/opentelemetry-util-http/src/opentelemetry
+  lint-util-http: pylint {toxinidir}/util/opentelemetry-util-http/tests
 
   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

diff --git a/util/opentelemetry-util-http/tests/test_remove_credentials.py b/util/opentelemetry-util-http/tests/test_remove_credentials.py
@@ -19,9 +19,13 @@ def test_remove_credentials(self):
     def test_remove_credentials_ipv4_literal(self):
         url = "http://someuser:[email protected]:8080/test/path?query=value"
         cleaned_url = remove_url_credentials(url)
-        self.assertEqual(cleaned_url, "http://127.0.0.1:8080/test/path?query=value")
+        self.assertEqual(
+            cleaned_url, "http://127.0.0.1:8080/test/path?query=value"
+        )
 
     def test_remove_credentials_ipv6_literal(self):
         url = "http://someuser:somepass@[::1]:8080/test/path?query=value"
         cleaned_url = remove_url_credentials(url)
-        self.assertEqual(cleaned_url, "http://[::1]:8080/test/path?query=value")
+        self.assertEqual(
+            cleaned_url, "http://[::1]:8080/test/path?query=value"
+        )