Merge branch 'main' into deprecated

Author: xrmx

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.6.9
+    rev: v0.14.1
     hooks:
       # Run the linter.
       - id: ruff

CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - docs: Added sqlcommenter example
   ([#4734](https://github.com/open-telemetry/opentelemetry-python/pull/4734))
+- build: bump ruff to 0.14.1
+  ([#4782](https://github.com/open-telemetry/opentelemetry-python/pull/4782))
 
 ## Version 1.38.0/0.59b0 (2025-10-16)
 

dev-requirements.txt

@@ -17,4 +17,4 @@ psutil==5.9.6
 GitPython==3.1.41
 pre-commit==3.7.0; python_version >= '3.9'
 pre-commit==3.5.0; python_version < '3.9'
-ruff==0.6.9
+ruff==0.14.1

docs/examples/django/manage.py

@@ -30,7 +30,9 @@ def main():
     DjangoInstrumentor().instrument()
 
     try:
-        from django.core.management import execute_from_command_line
+        from django.core.management import (  # noqa: PLC0415
+            execute_from_command_line,
+        )
     except ImportError as exc:
         raise ImportError(
             "Couldn't import Django. Are you sure it's installed and "

opentelemetry-api/tests/propagators/test_propagators.py

@@ -45,7 +45,7 @@ def test_propagators(propagators):
         )
 
         # pylint: disable=import-outside-toplevel
-        import opentelemetry.propagate
+        import opentelemetry.propagate  # noqa: PLC0415
 
         reload(opentelemetry.propagate)
 
@@ -66,7 +66,7 @@ def test_propagators(propagators):
         )
 
         # pylint: disable=import-outside-toplevel
-        import opentelemetry.propagate
+        import opentelemetry.propagate  # noqa: PLC0415
 
         reload(opentelemetry.propagate)
 
@@ -89,7 +89,7 @@ def test_propagators(propagators):
         )
 
         # pylint: disable=import-outside-toplevel
-        import opentelemetry.propagate
+        import opentelemetry.propagate  # noqa: PLC0415
 
         reload(opentelemetry.propagate)
 
@@ -141,7 +141,7 @@ def test_propagators(propagators):
         )
 
         # pylint: disable=import-outside-toplevel
-        import opentelemetry.propagate
+        import opentelemetry.propagate  # noqa: PLC0415
 
         reload(opentelemetry.propagate)
 
@@ -151,7 +151,7 @@ def test_propagators(propagators):
     def test_composite_propagators_error(self):
         with self.assertRaises(ValueError) as cm:
             # pylint: disable=import-outside-toplevel
-            import opentelemetry.propagate
+            import opentelemetry.propagate  # noqa: PLC0415
 
             reload(opentelemetry.propagate)
 

opentelemetry-sdk/tests/metrics/exponential_histogram/test_exponential_bucket_histogram_aggregation.py

@@ -1194,9 +1194,9 @@ def collect_and_validate(values, histogram) -> None:
                     # pylint: disable=chained-comparison
                     if value > lower_bound and value <= upper_bound:
                         matches += 1
-                assert (
-                    matches == count
-                ), f"index: {index}, count: {count}, scale: {scale}, lower_bound: {lower_bound}, upper_bound: {upper_bound}, matches: {matches}"
+                assert matches == count, (
+                    f"index: {index}, count: {count}, scale: {scale}, lower_bound: {lower_bound}, upper_bound: {upper_bound}, matches: {matches}"
+                )
 
             assert sum(buckets) + result.zero_count == len(values)
             assert result.sum == sum(values)

opentelemetry-sdk/tests/metrics/integration_test/test_cpu_time.py

@@ -233,9 +233,9 @@ def cpu_time_callback(
         )
 
     def test_cpu_time_generator(self):
-        def cpu_time_generator() -> (
-            Generator[Iterable[Observation], None, None]
-        ):
+        def cpu_time_generator() -> Generator[
+            Iterable[Observation], None, None
+        ]:
             options = yield
             while True:
                 self.assertIsInstance(options, CallbackOptions)

opentelemetry-sdk/tests/metrics/test_import.py

@@ -24,7 +24,7 @@ def test_import_init(self):
         """
 
         with self.assertNotRaises(Exception):
-            from opentelemetry.sdk.metrics import (  # noqa: F401
+            from opentelemetry.sdk.metrics import (  # noqa: F401, PLC0415
                 Counter,
                 Histogram,
                 Meter,
@@ -42,7 +42,7 @@ def test_import_export(self):
         """
 
         with self.assertNotRaises(Exception):
-            from opentelemetry.sdk.metrics.export import (  # noqa: F401
+            from opentelemetry.sdk.metrics.export import (  # noqa: F401, PLC0415
                 AggregationTemporality,
                 ConsoleMetricExporter,
                 DataPointT,
@@ -69,7 +69,7 @@ def test_import_view(self):
         """
 
         with self.assertNotRaises(Exception):
-            from opentelemetry.sdk.metrics.view import (  # noqa: F401
+            from opentelemetry.sdk.metrics.view import (  # noqa: F401, PLC0415
                 Aggregation,
                 DefaultAggregation,
                 DropAggregation,