update set_current/reset to attach/detach in RuntimeContext

Alex Boten · Alex Boten · commit e6988ff73cfd · 2020-02-25T08:45:56.000-08:00
Signed-off-by: Alex Boten &lt;aboten@lightstep.com&gt;
diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py
@@ -95,7 +95,7 @@ def attach(context: Context) -> object:
     """
     get_current()
 
-    return _RUNTIME_CONTEXT.set_current(context)  # type:ignore
+    return _RUNTIME_CONTEXT.attach(context)  # type:ignore
 
 
 def detach(token: object) -> None:
@@ -106,7 +106,7 @@ def detach(token: object) -> None:
         token: The Token that was returned by a previous call to attach a Context.
     """
     try:
-        _RUNTIME_CONTEXT.reset(token)  # type: ignore
+        _RUNTIME_CONTEXT.detach(token)  # type: ignore
     except (AttributeError, TypeError, ValueError):
         logger.error("Failed to detach context")
 
diff --git a/opentelemetry-api/src/opentelemetry/context/context.py b/opentelemetry-api/src/opentelemetry/context/context.py
@@ -29,7 +29,7 @@ class RuntimeContext(ABC):
     """
 
     @abstractmethod
-    def set_current(self, context: Context) -> object:
+    def attach(self, context: Context) -> object:
         """ Sets the current `Context` object. Returns a
         token that can be used to reset to the previous `Context`.
 
@@ -42,7 +42,7 @@ def get_current(self) -> Context:
         """ Returns the current `Context` object. """
 
     @abstractmethod
-    def reset(self, token: object) -> None:
+    def detach(self, token: object) -> None:
         """ Resets Context to a previous value
 
         Args:
diff --git a/opentelemetry-api/src/opentelemetry/context/contextvars_context.py b/opentelemetry-api/src/opentelemetry/context/contextvars_context.py
@@ -35,16 +35,16 @@ def __init__(self) -> None:
             self._CONTEXT_KEY, default=Context()
         )
 
-    def set_current(self, context: Context) -> object:
-        """See `opentelemetry.context.RuntimeContext.set_current`."""
+    def attach(self, context: Context) -> object:
+        """See `opentelemetry.context.RuntimeContext.attach`."""
         return self._current_context.set(context)
 
     def get_current(self) -> Context:
         """See `opentelemetry.context.RuntimeContext.get_current`."""
         return self._current_context.get()
 
-    def reset(self, token: object) -> None:
-        """See `opentelemetry.context.RuntimeContext.reset`."""
+    def detach(self, token: object) -> None:
+        """See `opentelemetry.context.RuntimeContext.detach`."""
         self._current_context.reset(token)  # type: ignore
 
 
diff --git a/opentelemetry-api/src/opentelemetry/context/threadlocal_context.py b/opentelemetry-api/src/opentelemetry/context/threadlocal_context.py
@@ -32,8 +32,8 @@ def __init__(self, context: Context) -> None:
     def __init__(self) -> None:
         self._current_context = threading.local()
 
-    def set_current(self, context: Context) -> object:
-        """See `opentelemetry.context.RuntimeContext.set_current`."""
+    def attach(self, context: Context) -> object:
+        """See `opentelemetry.context.RuntimeContext.attach`."""
         current = self.get_current()
         setattr(self._current_context, self._CONTEXT_KEY, context)
         return self._Token(current)
@@ -49,8 +49,8 @@ def get_current(self) -> Context:
         )  # type: Context
         return context
 
-    def reset(self, token: object) -> None:
-        """See `opentelemetry.context.RuntimeContext.reset`."""
+    def detach(self, token: object) -> None:
+        """See `opentelemetry.context.RuntimeContext.detach`."""
         if not isinstance(token, self._Token):
             raise ValueError("invalid token")
         setattr(self._current_context, self._CONTEXT_KEY, token.context)
