Merge branch 'main' into issue-2443

Author: srikanthccv

dev-requirements.txt

@@ -3,7 +3,7 @@ flake8~=3.7
 isort~=5.8
 black~=22.1.0
 httpretty~=1.0
-mypy==0.812
+mypy==0.931
 sphinx~=3.5.4
 sphinx-rtd-theme~=0.5
 sphinx-autodoc-typehints~=1.12.0

opentelemetry-api/src/opentelemetry/baggage/propagation/__init__.py

@@ -14,7 +14,7 @@
 #
 from logging import getLogger
 from re import split
-from typing import Iterable, Mapping, Optional, Set
+from typing import Iterable, List, Mapping, Optional, Set
 from urllib.parse import quote_plus, unquote_plus
 
 from opentelemetry.baggage import _is_valid_pair, get_all, set_baggage
@@ -63,7 +63,7 @@ def extract(
             )
             return context
 
-        baggage_entries = split(_DELIMITER_PATTERN, header)
+        baggage_entries: List[str] = split(_DELIMITER_PATTERN, header)
         total_baggage_entries = self._MAX_PAIRS
 
         if len(baggage_entries) > self._MAX_PAIRS:

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

@@ -326,7 +326,7 @@ def start_span(
             The newly-created span.
         """
 
-    @contextmanager  # type: ignore
+    @contextmanager
     @abstractmethod
     def start_as_current_span(
         self,
@@ -449,7 +449,7 @@ def start_span(
         # pylint: disable=unused-argument,no-self-use
         return INVALID_SPAN
 
-    @contextmanager  # type: ignore
+    @contextmanager
     def start_as_current_span(
         self,
         name: str,
@@ -535,7 +535,7 @@ def get_tracer_provider() -> TracerProvider:
     return cast("TracerProvider", _TRACER_PROVIDER)
 
 
-@contextmanager  # type: ignore
+@contextmanager
 def use_span(
     span: Span,
     end_on_exit: bool = False,

opentelemetry-api/src/opentelemetry/trace/propagation/tracecontext.py

@@ -55,16 +55,16 @@ def extract(
         if not match:
             return context
 
-        version = match.group(1)
-        trace_id = match.group(2)
-        span_id = match.group(3)
-        trace_flags = match.group(4)
+        version: str = match.group(1)
+        trace_id: str = match.group(2)
+        span_id: str = match.group(3)
+        trace_flags: str = match.group(4)
 
         if trace_id == "0" * 32 or span_id == "0" * 16:
             return context
 
         if version == "00":
-            if match.group(5):
+            if match.group(5):  # type: ignore
                 return context
         if version == "ff":
             return context

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

@@ -352,9 +352,10 @@ def from_header(cls, header_list: typing.List[str]) -> "TraceState":
             If the number of keys is beyond the maximum, all values
             will be discarded and an empty tracestate will be returned.
         """
-        pairs = OrderedDict()
+        pairs = OrderedDict()  # type: OrderedDict[str, str]
         for header in header_list:
-            for member in re.split(_delimiter_pattern, header):
+            members: typing.List[str] = re.split(_delimiter_pattern, header)
+            for member in members:
                 # empty members are valid, but no need to process further.
                 if not member:
                     continue
@@ -365,7 +366,8 @@ def from_header(cls, header_list: typing.List[str]) -> "TraceState":
                         member,
                     )
                     return cls()
-                key, _eq, value = match.groups()
+                groups: typing.Tuple[str, ...] = match.groups()
+                key, _eq, value = groups
                 # duplicate keys are not legal in header
                 if key in pairs:
                     return cls()

opentelemetry-api/src/opentelemetry/util/re.py

@@ -14,7 +14,7 @@
 
 import logging
 from re import compile, split
-from typing import Mapping
+from typing import Dict, List, Mapping
 from urllib.parse import unquote
 
 _logger = logging.getLogger(__name__)
@@ -42,8 +42,9 @@ def parse_headers(s: str) -> Mapping[str, str]:
     HTTP header format https://www.w3.org/TR/baggage/#baggage-http-header-format, except that
     additional semi-colon delimited metadata is not supported.
     """
-    headers = {}
-    for header in split(_DELIMITER_PATTERN, s):
+    headers: Dict[str, str] = {}
+    headers_list: List[str] = split(_DELIMITER_PATTERN, s)
+    for header in headers_list:
         if not header:  # empty string
             continue
         match = _HEADER_PATTERN.fullmatch(header.strip())

tox.ini

@@ -165,13 +165,13 @@ commands =
   opentelemetry: pytest {posargs}
   coverage: {toxinidir}/scripts/coverage.sh
 
-  mypy: mypy --namespace-packages --explicit-package-bases opentelemetry-api/src/opentelemetry/
+  mypy: mypy --install-types --non-interactive --namespace-packages --explicit-package-bases opentelemetry-api/src/opentelemetry/
 ; For test code, we don't want to enforce the full mypy strictness
-  mypy: mypy --namespace-packages --config-file=mypy-relaxed.ini opentelemetry-api/tests/
+  mypy: mypy --install-types --non-interactive --namespace-packages --config-file=mypy-relaxed.ini opentelemetry-api/tests/
 
 ; Test that mypy can pick up typeinfo from an installed package (otherwise,
 ; implicit Any due to unfollowed import would result).
-  mypyinstalled: mypy --namespace-packages opentelemetry-api/tests/mypysmoke.py --strict
+  mypyinstalled: mypy --install-types --non-interactive --namespace-packages opentelemetry-api/tests/mypysmoke.py --strict
 
 [testenv:lint]
 basepython: python3.9