Merge branch 'master' into prop

Author: lzchen

opentelemetry-api/src/opentelemetry/trace/span.py

@@ -77,7 +77,7 @@ def is_recording(self) -> bool:
     @abc.abstractmethod
     def set_status(self, status: Status) -> None:
         """Sets the Status of the Span. If used, this will override the default
-        Span status, which is OK.
+        Span status.
         """
 
     @abc.abstractmethod