Skip to content

Commit 0a91188

Browse files
emdnetoxrmx
authored andcommitted
add opentelemetry-util-http to CI (open-telemetry#2655)
1 parent c6f4efa commit 0a91188

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

Diff for: .github/workflows/instrumentations_1.yml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
- "propagator-ot-trace"
3838
- "resource-detector-azure"
3939
- "resource-detector-container"
40+
- "util-http"
4041
os: [ubuntu-20.04]
4142
exclude:
4243
- python-version: pypy3

Diff for: .github/workflows/lint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ jobs:
7171
- "resource-detector-azure"
7272
- "resource-detector-container"
7373
- "sdk-extension-aws"
74+
- "util-http"
7475
os: [ubuntu-20.04]
7576
runs-on: ubuntu-20.04
7677
steps:

Diff for: tox.ini

+12-6
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ envlist =
308308
; opentelemetry-util-http
309309
py3{8,9,10,11,12}-test-util-http
310310
pypy3-test-util-http
311+
lint-util-http
311312

312313
; opentelemetry-propagator-aws-xray
313314
py3{8,9,10,11,12}-test-propagator-aws-xray
@@ -772,12 +773,12 @@ commands_pre =
772773
processor-baggage: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
773774
processor-baggage: pip install -r {toxinidir}/processor/opentelemetry-processor-baggage/test-requirements.txt
774775

775-
http: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
776-
http: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
777-
http: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
778-
http: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
779-
http: pip install -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
780-
http: pip install {toxinidir}/util/opentelemetry-util-http
776+
util-http: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
777+
util-http: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
778+
util-http: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
779+
util-http: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
780+
util-http: pip install -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
781+
util-http: pip install {toxinidir}/util/opentelemetry-util-http
781782

782783
; In order to get a health coverage report,
783784
; we have to install packages in editable mode.
@@ -1135,6 +1136,11 @@ commands =
11351136
lint-instrumentation-asyncio: pylint {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncio/tests
11361137

11371138
test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
1139+
lint-util-http: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/util/opentelemetry-util-http
1140+
lint-util-http: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/util/opentelemetry-util-http
1141+
lint-util-http: flake8 --config {toxinidir}/.flake8 {toxinidir}/util/opentelemetry-util-http
1142+
lint-util-http: pylint {toxinidir}/util/opentelemetry-util-http/src/opentelemetry
1143+
lint-util-http: pylint {toxinidir}/util/opentelemetry-util-http/tests
11381144

11391145
test-sdk-extension-aws: pytest {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws/tests {posargs}
11401146
lint-sdk-extension-aws: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/sdk-extension/opentelemetry-sdk-extension-aws

Diff for: util/opentelemetry-util-http/tests/test_remove_credentials.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ def test_remove_credentials(self):
1919
def test_remove_credentials_ipv4_literal(self):
2020
url = "http://someuser:[email protected]:8080/test/path?query=value"
2121
cleaned_url = remove_url_credentials(url)
22-
self.assertEqual(cleaned_url, "http://127.0.0.1:8080/test/path?query=value")
22+
self.assertEqual(
23+
cleaned_url, "http://127.0.0.1:8080/test/path?query=value"
24+
)
2325

2426
def test_remove_credentials_ipv6_literal(self):
2527
url = "http://someuser:somepass@[::1]:8080/test/path?query=value"
2628
cleaned_url = remove_url_credentials(url)
27-
self.assertEqual(cleaned_url, "http://[::1]:8080/test/path?query=value")
29+
self.assertEqual(
30+
cleaned_url, "http://[::1]:8080/test/path?query=value"
31+
)

0 commit comments

Comments
 (0)