Update several files

.pylintrc

@@ -28,7 +28,7 @@ limit-inference-results=100
 
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
-load-plugins=
+load-plugins=pylint.extensions.no_self_use
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -68,14 +68,14 @@ disable=missing-docstring,
       duplicate-code,
       ungrouped-imports, # Leave this up to isort
       wrong-import-order, # Leave this up to isort
-      bad-continuation, # Leave this up to black
       line-too-long, # Leave this up to black
       exec-used,
       super-with-arguments, # temp-pylint-upgrade
       isinstance-second-argument-not-valid-type, # temp-pylint-upgrade
       raise-missing-from, # temp-pylint-upgrade
       unused-argument, # temp-pylint-upgrade
       redefined-builtin,
+      cyclic-import,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -263,13 +263,6 @@ max-line-length=79
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

dev-requirements.txt

@@ -1,4 +1,4 @@
-pylint==2.11.0
+pylint==3.0.2
 flake8~=3.7
 isort~=5.8
 black~=22.3.0
@@ -8,7 +8,7 @@ sphinx~=7.1
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints~=1.25
 pytest==7.1.3
-pytest-cov>=2.8
+pytest-cov~=4.1
 readme-renderer~=24.0
 # This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with
 # both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123).

docs-requirements.txt

@@ -13,13 +13,12 @@ sphinx-jekyll-builder==0.3.0
 ./shim/opentelemetry-opentracing-shim
 
 # Required by instrumentation and exporter packages
-ddtrace>=0.34.0
 grpcio~=1.27
-Deprecated>=1.2.6
-django>=2.2
+Deprecated~=1.2
+django~=4.2
 flask~=1.0
 opentracing~=2.2.0
-thrift>=0.10.0
+thrift~=0.10
 wrapt>=1.0.0,<2.0.0
 # temporary fix. we should update the jinja, flask deps
 # See https://github.com/pallets/markupsafe/issues/282

exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/send.py

@@ -125,7 +125,7 @@ def __init__(self, thrift_url="", auth=None, timeout_in_millis=None):
         if auth is not None:
             auth_header = f"{auth[0]}:{auth[1]}"
             decoded = base64.b64encode(auth_header.encode()).decode("ascii")
-            basic_auth = dict(Authorization=f"Basic {decoded}")
+            basic_auth = {"Authorization": f"Basic {decoded}"}
             self.http_transport.setCustomHeaders(basic_auth)
 
     def submit(self, batch: jaeger.Batch):

opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

@@ -177,7 +177,7 @@ def get_logger_provider() -> LoggerProvider:
     """Gets the current global :class:`~.LoggerProvider` object."""
     global _LOGGER_PROVIDER  # pylint: disable=global-statement
     if _LOGGER_PROVIDER is None:
-        if _OTEL_PYTHON_LOGGER_PROVIDER not in environ.keys():
+        if _OTEL_PYTHON_LOGGER_PROVIDER not in environ:
             # TODO: return proxy
             _LOGGER_PROVIDER = NoOpLoggerProvider()
             return _LOGGER_PROVIDER

opentelemetry-api/src/opentelemetry/metrics/_internal/__init__.py

@@ -75,6 +75,7 @@
 _logger = getLogger(__name__)
 
 
+# pylint: disable=invalid-name
 _ProxyInstrumentT = Union[
     _ProxyCounter,
     _ProxyHistogram,
@@ -760,7 +761,7 @@ def get_meter_provider() -> MeterProvider:
     """Gets the current global :class:`~.MeterProvider` object."""
 
     if _METER_PROVIDER is None:
-        if OTEL_PYTHON_METER_PROVIDER not in environ.keys():
+        if OTEL_PYTHON_METER_PROVIDER not in environ:
             return _PROXY_METER_PROVIDER
 
         meter_provider: MeterProvider = _load_provider(  # type: ignore

opentelemetry-api/src/opentelemetry/metrics/_internal/instrument.py

@@ -55,6 +55,7 @@ class CallbackOptions:
 
 
 InstrumentT = TypeVar("InstrumentT", bound="Instrument")
+# pylint: disable=invalid-name
 CallbackT = Union[
     Callable[[CallbackOptions], Iterable[Observation]],
     Generator[Iterable[Observation], CallbackOptions, None],

opentelemetry-api/src/opentelemetry/propagators/textmap.py

@@ -18,6 +18,7 @@
 from opentelemetry.context.context import Context
 
 CarrierT = typing.TypeVar("CarrierT")
+# pylint: disable=invalid-name
 CarrierValT = typing.Union[typing.List[str], str]
 
 

opentelemetry-api/tests/context/test_contextvars_context.py

@@ -17,10 +17,12 @@
 from opentelemetry import context
 from opentelemetry.context.contextvars_context import ContextVarsRuntimeContext
 
-from .base_context import ContextTestCases
+# pylint: disable=import-error,no-name-in-module
+from tests.context.base_context import ContextTestCases
 
 
 class TestContextVarsContext(ContextTestCases.BaseTest):
+    # pylint: disable=invalid-name
     def setUp(self) -> None:
         super().setUp()
         self.mock_runtime = patch.object(
@@ -30,6 +32,7 @@ def setUp(self) -> None:
         )
         self.mock_runtime.start()
 
+    # pylint: disable=invalid-name
     def tearDown(self) -> None:
         super().tearDown()
         self.mock_runtime.stop()

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/aggregation.py

@@ -646,6 +646,7 @@ def aggregate(self, measurement: Measurement) -> None:
 
             # 3. Determine if a change of scale is needed.
             is_rescaling_needed = False
+            low, high = 0, 0
 
             if len(buckets) == 0:
                 buckets.index_start = index

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/point.py

@@ -170,6 +170,7 @@ def to_json(self, indent=4) -> str:
         )
 
 
+# pylint: disable=invalid-name
 DataT = Union[Sum, Gauge, Histogram]
 DataPointT = Union[NumberDataPoint, HistogramDataPoint]
 

opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py

@@ -365,11 +365,11 @@ def get_aggregated_resources(
         futures = [executor.submit(detector.detect) for detector in detectors]
         for detector_ind, future in enumerate(futures):
             detector = detectors[detector_ind]
+            detected_resource: Resource = _EMPTY_RESOURCE
             try:
                 detected_resource = future.result(timeout=timeout)
             # pylint: disable=broad-except
             except Exception as ex:
-                detected_resource = _EMPTY_RESOURCE
                 if detector.raise_on_error:
                     raise ex
                 logger.warning(

opentelemetry-sdk/tests/trace/test_trace.py

@@ -1220,6 +1220,7 @@ def test_record_exception_with_attributes_and_timestamp(self):
         self.assertEqual(1604238587112021089, exception_event.timestamp)
 
     def test_record_exception_context_manager(self):
+        span = None
         try:
             with self.tracer.start_as_current_span("span") as span:
                 raise RuntimeError("example error")

pyproject.toml

@@ -5,6 +5,9 @@ exclude = '''
   /(  # generated files
     .tox|
     venv|
+    venv.*|
+    .venv.*|
+    target.*|
     .*/build/lib/.*|
     exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/gen|
     exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/gen|

scripts/update_sha.py

@@ -25,7 +25,7 @@
 
 def get_sha(branch):
     url = API_URL + branch
-    response = requests.get(url)
+    response = requests.get(url, timeout=15)
     response.raise_for_status()
     return response.json()["sha"]
 

shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py

@@ -387,6 +387,7 @@ def from_context_manager(cls, manager: "ScopeManagerShim", span_cm):
                 :meth:`opentelemetry.trace.use_span`.
         """
 
+        # pylint: disable=unnecessary-dunder-call
         otel_span = span_cm.__enter__()
         span_context = SpanContextShim(otel_span.get_span_context())
         span = SpanShim(manager.tracer, span_context, otel_span)

shim/opentelemetry-opentracing-shim/tests/testbed/test_multiple_callbacks/test_threads.py

@@ -55,6 +55,7 @@ def test_main(self):
     def task(self, interval, parent_span):
         logger.info("Starting task")
 
+        scope = None
         try:
             scope = self.tracer.scope_manager.activate(parent_span, False)
             with self.tracer.start_active_span("task"):

tox.ini

@@ -191,7 +191,7 @@ commands =
   mypyinstalled: mypy --install-types --non-interactive --namespace-packages opentelemetry-api/tests/mypysmoke.py --strict
 
 [testenv:spellcheck]
-basepython: python3.10
+basepython: python3
 recreate = True
 deps =
   codespell
@@ -200,20 +200,14 @@ commands =
   codespell
 
 [testenv:lint]
-basepython: python3.10
+basepython: python3
 recreate = True
 deps =
-  -c dev-requirements.txt
-  asgiref
-  pylint
-  flake8
-  isort
-  black
-  psutil
-  readme_renderer
-  httpretty
-  GitPython
-  flaky
+  -r dev-requirements.txt
+  asgiref~=3.7
+  psutil~=5.9
+  GitPython==3.1.40
+  flaky~=3.7
 
 commands_pre =
   python -m pip install -e {toxinidir}/opentelemetry-api[test]
@@ -250,14 +244,12 @@ recreate = True
 deps =
   -c {toxinidir}/dev-requirements.txt
   -r {toxinidir}/docs-requirements.txt
-
 changedir = docs
-
 commands =
   sphinx-build -E -a -W -b html -T . _build/html
 
 [testenv:tracecontext]
-basepython: python3.10
+basepython: python3
 deps =
   # needed for tracecontext
   aiohttp~=3.6
@@ -283,11 +275,11 @@ commands =
 
 [testenv:docker-tests-proto{3,4}]
 deps =
-  pytest
+  pytest==7.1.3
   # Pinning PyYAML for issue: https://github.com/yaml/pyyaml/issues/724
-  PyYAML == 5.3.1
-  docker-compose >= 1.25.2
-  requests < 2.29.0
+  PyYAML==5.3.1
+  docker-compose==1.29.2
+  requests==2.28.2
 
   ; proto 3 and 4 tests install the respective version of protobuf
   proto3: protobuf~=3.19.0
@@ -319,9 +311,9 @@ commands_post =
   docker-compose down -v
 
 [testenv:public-symbols-check]
-basepython: python3.10
+basepython: python3
 recreate = True
 deps =
-  GitPython
+  GitPython==3.1.40
 commands =
   python {toxinidir}/scripts/public_symbols_checker.py