Fix ASGIGetter keys to fetch from actual carrier headers (open-teleme…

…try#1435)
james-emerton · Jan 19, 2023 · f16f059 · f16f059
1 parent bc26d97
commit f16f059
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py b/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
@@ -260,7 +260,8 @@ def get(
         return decoded
 
     def keys(self, carrier: dict) -> typing.List[str]:
-        return [_key.decode("utf8") for (_key, _value) in carrier]
+        headers = carrier.get("headers") or []
+        return [_key.decode("utf8") for (_key, _value) in headers]
 
 
 asgi_getter = ASGIGetter()

diff --git a/instrumentation/opentelemetry-instrumentation-asgi/tests/test_getter.py b/instrumentation/opentelemetry-instrumentation-asgi/tests/test_getter.py
@@ -18,12 +18,18 @@
 
 
 class TestASGIGetter(TestCase):
-    def test_get_none(self):
+    def test_get_none_empty_carrier(self):
         getter = ASGIGetter()
         carrier = {}
         val = getter.get(carrier, "test")
         self.assertIsNone(val)
 
+    def test_get_none_empty_headers(self):
+        getter = ASGIGetter()
+        carrier = {"headers": []}
+        val = getter.get(carrier, "test")
+        self.assertIsNone(val)
+
     def test_get_(self):
         getter = ASGIGetter()
         carrier = {"headers": [(b"test-key", b"val")]}
@@ -44,7 +50,22 @@ def test_get_(self):
             "Should be case insensitive",
         )
 
-    def test_keys(self):
+    def test_keys_empty_carrier(self):
         getter = ASGIGetter()
         keys = getter.keys({})
         self.assertEqual(keys, [])
+
+    def test_keys_empty_headers(self):
+        getter = ASGIGetter()
+        keys = getter.keys({"headers": []})
+        self.assertEqual(keys, [])
+
+    def test_keys(self):
+        getter = ASGIGetter()
+        carrier = {"headers": [(b"test-key", b"val")]}
+        expected_val = ["test-key"]
+        self.assertEqual(
+            getter.keys(carrier),
+            expected_val,
+            "Should be equal",
+        )