diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb400df..2b7cceb 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ repos: - id: fix-encoding-pragma - id: flake8 - repo: https://github.com/pycqa/isort - rev: 5.6.3 + rev: 5.12.0 hooks: - id: isort - repo: https://github.com/ambv/black diff --git a/nameko_opentelemetry/version.py b/nameko_opentelemetry/version.py index e759cf1..a023d60 100644 --- a/nameko_opentelemetry/version.py +++ b/nameko_opentelemetry/version.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -__version__ = "0.5.1" +__version__ = "0.5.2" diff --git a/setup.py b/setup.py index a39d04d..dec62d2 100644 --- a/setup.py +++ b/setup.py @@ -30,9 +30,7 @@ "opentelemetry-api", "opentelemetry-instrumentation", "opentelemetry-instrumentation-wsgi", - "importlib-metadata<=4.13.0", # Temporary pin, - # remove when https://github.com/celery/kombu/pull/1601 - # is in the most recent version of kombu + "importlib-metadata<5 ; python_version<='3.7'", ], extras_require={ "dev": list(PACKAGE_INFO["_instruments"]) diff --git a/tests/test_http.py b/tests/test_http.py index 857a335..88c23f5 100644 --- a/tests/test_http.py +++ b/tests/test_http.py @@ -89,7 +89,7 @@ def test_no_match(self, container, web_session, memory_exporter): spans = memory_exporter.get_finished_spans() assert len(spans) == 1 - assert spans[0].name == "HTTP GET" + assert "GET" in spans[0].name class TestNoEntrypointFired: @@ -121,7 +121,7 @@ def test_method_not_found(self, container, web_session, memory_exporter): span = spans[0] - assert spans[0].name == "HTTP GET" + assert "GET" in spans[0].name assert not span.status.is_ok assert span.status.status_code == StatusCode.ERROR @@ -139,7 +139,7 @@ def test_method_not_allowed(self, container, web_session, memory_exporter): span = spans[0] - assert spans[0].name == "HTTP POST" + assert "POST" in spans[0].name assert not span.status.is_ok assert span.status.status_code == StatusCode.ERROR