Upgrade starlette, python (#40)

* Make tests explicit (new starlette always returns content-length header)

* Upgrade to latest starlette

* Add test coverage for new python versions

* Update python version to properly work with double digits

* add extra test for config

* Formatting

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2

Pipfile

@@ -15,7 +15,7 @@ pytest-asyncio = "==0.16.0"
 
 [packages]
 aiozipkin = "==1.0.0"
-starlette = "==0.14.1"
+starlette = "==0.20.4"
 
 [pipenv]
 allow_prereleases = false

setup.py

@@ -45,8 +45,8 @@ def get_packages(package):
     author_email="mic.vala@gmail.com",
     packages=get_packages("starlette_zipkin"),
     install_requires=[
-        'aiozipkin <2',
-        'starlette >0.14,<18',
+        "aiozipkin <2",
+        "starlette >0.14,<21",
     ],
     classifiers=[
         "Development Status :: 3 - Alpha",

tests/test_config.py

@@ -1,8 +1,14 @@
+import pytest
 from starlette.testclient import TestClient
 
 from starlette_zipkin import ZipkinConfig, ZipkinMiddleware
 
 
+def test_config_instance(app, tracer):
+    with pytest.raises(ValueError):
+        app.add_middleware(ZipkinMiddleware, config=TestClient, _tracer=tracer)
+
+
 def test_sync_no_inject(app, tracer, b3_keys):
     config = ZipkinConfig(inject_response_headers=False)
     app.add_middleware(ZipkinMiddleware, config=config, _tracer=tracer)

tests/test_middleware.py

@@ -22,14 +22,9 @@ async def test_dispatch_trace_new_child(app, dummy_request, next_response):
     )
     assert middleware.tracer is not None
     assert middleware.tracer._transport is not None
-    assert (
-        str(middleware.tracer._transport._address)
-        == "http://zipkin.host:9411/api/v2/spans"
-    )
-    assert dict(resp.headers) == {
-        "x-b3-spanid": span_id,
-        "x-b3-traceid": trace_id,
-    }
+    assert str(middleware.tracer._transport._address) == "http://zipkin.host:9411/api/v2/spans"
+    assert resp.headers["x-b3-spanid"] == span_id
+    assert resp.headers["x-b3-traceid"] == trace_id
     await middleware.tracer.close()
 
 
@@ -45,16 +40,11 @@ async def test_dispatch_trace(app, dummy_request, next_response):
     )
     assert middleware.tracer is not None
     assert middleware.tracer._transport is not None
-    assert (
-        str(middleware.tracer._transport._address)
-        == "http://localhost:9411/api/v2/spans"
-    )
-    assert dict(resp.headers) == {
-        "x-b3-flags": "0",
-        "x-b3-sampled": "1",
-        "x-b3-spanid": resp.headers["x-b3-spanid"],
-        "x-b3-traceid": resp.headers["x-b3-traceid"],
-    }
+    assert str(middleware.tracer._transport._address) == "http://localhost:9411/api/v2/spans"
+    assert resp.headers["x-b3-flags"] == "0"
+    assert resp.headers["x-b3-sampled"] == "1"
+    assert resp.headers["x-b3-spanid"] == resp.headers["x-b3-spanid"]
+    assert resp.headers["x-b3-traceid"] == resp.headers["x-b3-traceid"]
     await middleware.tracer.close()
 
 
@@ -76,12 +66,10 @@ async def test_dispatch_trace_buggy_headers(app, dummy_request, next_response):
     )
     assert middleware.tracer is not None
     assert middleware.tracer._transport is not None
-    assert dict(resp.headers) == {
-        "x-b3-flags": "0",
-        "x-b3-sampled": "1",
-        "x-b3-spanid": resp.headers["x-b3-spanid"],
-        "x-b3-traceid": resp.headers["x-b3-traceid"],
-    }
+    assert resp.headers["x-b3-flags"] == "0"
+    assert resp.headers["x-b3-sampled"] == "1"
+    assert resp.headers["x-b3-spanid"] == resp.headers["x-b3-spanid"]
+    assert resp.headers["x-b3-traceid"] == resp.headers["x-b3-traceid"]
     # we cannot reuse the traceid if the span id was missing
     assert trace_id != resp.headers["x-b3-spanid"]
     await middleware.tracer.close()
@@ -172,10 +160,12 @@ def test_get_transaction(app, params):
     transac = middleware.get_transaction({"endpoint": params["endpoint"]})
     assert transac == params["expected"]
 
+
 def test_get_ip_with_hostname_that_resolves(monkeypatch):
     monkeypatch.setattr(middleware.socket, "gethostname", lambda: "localhost")
     assert middleware.get_ip() == "127.0.0.1"
 
+
 def test_get_ip_without_hostname_that_resolves(monkeypatch):
     monkeypatch.setattr(middleware.socket, "gethostname", lambda: "thishostnamewontresolve")
     assert middleware.get_ip() == "0.0.0.0"