Return EntryValue from get_entry_value.

open-telemetry · Aug 27, 2019 · 7eab1e8 · 7eab1e8
1 parent 23ea35d
commit 7eab1e8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/opentelemetry-api/src/opentelemetry/distributedcontext/__init__.py b/opentelemetry-api/src/opentelemetry/distributedcontext/__init__.py
@@ -87,13 +87,14 @@ def get_entries(self) -> typing.Iterable[Entry]:
     def get_entry_value(
             self,
             key: EntryKey
-    ) -> typing.Optional[Entry]:
+    ) -> typing.Optional[EntryValue]:
         """Returns the entry associated with a key or None
 
         Args:
             key: the key with which to perform a lookup
         """
-        return self._container.get(key)
+        if key in self._container:
+            return self._container[key].value
 
 
 class DistributedContextManager:

diff --git a/opentelemetry-api/tests/distributedcontext/test_distributed_context.py b/opentelemetry-api/tests/distributedcontext/test_distributed_context.py
@@ -83,7 +83,7 @@ def test_get_entry_value_present(self):
         value = self.context.get_entry_value(
             self.entry.key,
         )
-        self.assertIs(value, self.entry)
+        self.assertIs(value, self.entry.value)
 
     def test_get_entry_value_missing(self):
         key = distributedcontext.EntryKey("missing")