chore: apply fixes for UP ruff rule (open-telemetry#5133)

Author: emdneto

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Apply fixes for `UP` ruff rule
+  ([#5133](https://github.com/open-telemetry/opentelemetry-python/pull/5133))
 - Switch to SPDX license headers and add CI enforcement
   ([#5177](https://github.com/open-telemetry/opentelemetry-python/pull/5177))
 - `opentelemetry-api`: Enforce W3C Baggage size limits on outbound propagation in `W3CBaggagePropagator.inject()`. Previously only inbound extraction enforced limits; now inject also caps entries at 180, individual pairs at 4096 bytes, and total header at 8192 bytes per the W3C Baggage spec. The extract path max_pairs limit now counts all size-valid entries rather than only successfully parsed ones.

codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/generator.py

@@ -7,9 +7,9 @@
 
 import logging
 from collections import defaultdict
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from pathlib import Path
-from typing import Callable, Final, Optional, Set
+from typing import Final
 
 from google.protobuf import descriptor_pb2 as descriptor
 from google.protobuf.compiler import plugin_pb2 as plugin
@@ -125,7 +125,7 @@ def _index_message(
         msg_desc: descriptor.DescriptorProto,
         package: str,
         file_name: str,
-        parent_path: Optional[str],
+        parent_path: str | None,
     ) -> None:
         """
         Recursively index a message and its nested types.
@@ -365,7 +365,7 @@ def _generate_imports(
             writer.blank_line()
         writer.blank_line()
 
-    def _collect_imports(self, proto_file: str) -> Set[str]:
+    def _collect_imports(self, proto_file: str) -> set[str]:
         """
         Collect all import statements needed for cross file references.
 
@@ -421,7 +421,7 @@ def _generate_message_class(
         writer: CodeWriter,
         proto_file: str,
         msg_desc: descriptor.DescriptorProto,
-        parent_path: Optional[str] = None,
+        parent_path: str | None = None,
     ) -> None:
         """
         Generate a complete dataclass for a protobuf message.
@@ -951,7 +951,7 @@ def _resolve_enum_type(self, type_name: str, proto_file: str) -> str:
     @classmethod
     def _get_field_default(
         cls, field_desc: descriptor.FieldDescriptorProto
-    ) -> Optional[str]:
+    ) -> str | None:
         """
         Get the default value for a field.
 

codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/runtime/json_codec.py

@@ -38,14 +38,14 @@ def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls: type[M], data: typing.Union[str, bytes]) -> M:
+    def from_json(cls: type[M], data: str | bytes) -> M:
         """
         Deserialize from a JSON string or bytes.
         """
         return cls.from_dict(json.loads(data))
 
 
-def encode_hex(value: typing.Optional[bytes]) -> str:
+def encode_hex(value: bytes | None) -> str:
     """
     Encode bytes as hex string.
 
@@ -57,7 +57,7 @@ def encode_hex(value: typing.Optional[bytes]) -> str:
     return value.hex() if value else ""
 
 
-def encode_base64(value: typing.Optional[bytes]) -> str:
+def encode_base64(value: bytes | None) -> str:
     """
     Encode bytes as base64 string.
     Standard Proto3 JSON mapping for bytes.
@@ -83,7 +83,7 @@ def encode_int64(value: int) -> str:
     return str(value)
 
 
-def encode_float(value: float) -> typing.Union[float, str]:
+def encode_float(value: float) -> float | str:
     """
     Encode float/double values.
 
@@ -100,7 +100,7 @@ def encode_float(value: float) -> typing.Union[float, str]:
 
 
 def encode_repeated(
-    values: typing.Optional[list[T]],
+    values: list[T] | None,
     map_fn: typing.Callable[[T], typing.Any],
 ) -> list[typing.Any]:
     """
@@ -115,7 +115,7 @@ def encode_repeated(
     return [map_fn(v) for v in values] if values else []
 
 
-def decode_hex(value: typing.Optional[str], field_name: str) -> bytes:
+def decode_hex(value: str | None, field_name: str) -> bytes:
     """
     Decode hex string to bytes.
 
@@ -136,7 +136,7 @@ def decode_hex(value: typing.Optional[str], field_name: str) -> bytes:
         ) from None
 
 
-def decode_base64(value: typing.Optional[str], field_name: str) -> bytes:
+def decode_base64(value: str | None, field_name: str) -> bytes:
     """
     Decode base64 string to bytes.
 
@@ -157,9 +157,7 @@ def decode_base64(value: typing.Optional[str], field_name: str) -> bytes:
         ) from None
 
 
-def decode_int64(
-    value: typing.Optional[typing.Union[int, str]], field_name: str
-) -> int:
+def decode_int64(value: int | str | None, field_name: str) -> int:
     """
     Parse int64 from number or string.
 
@@ -180,9 +178,7 @@ def decode_int64(
         ) from None
 
 
-def decode_float(
-    value: typing.Optional[typing.Union[float, int, str]], field_name: str
-) -> float:
+def decode_float(value: float | int | str | None, field_name: str) -> float:
     """
     Parse float/double from number or string, handling special values.
 
@@ -210,7 +206,7 @@ def decode_float(
 
 
 def decode_repeated(
-    values: typing.Optional[list[typing.Any]],
+    values: list[typing.Any] | None,
     item_parser: typing.Callable[[typing.Any], T],
     field_name: str,
 ) -> list[T]:
@@ -232,7 +228,7 @@ def decode_repeated(
 
 def validate_type(
     value: typing.Any,
-    expected_types: typing.Union[type, tuple[type, ...]],
+    expected_types: type | tuple[type, ...],
     field_name: str,
 ) -> None:
     """

codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/writer.py

@@ -3,9 +3,9 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
+from collections.abc import Generator, Iterable
 from contextlib import contextmanager
-from typing import Any, Generator, Optional, Union
+from typing import Any
 
 
 # pylint: disable-next=too-many-public-methods
@@ -61,7 +61,7 @@ def writemany(self, *lines: str) -> CodeWriter:
             self.writeln(line)
         return self
 
-    def comment(self, content: Union[str, Iterable[str]]) -> CodeWriter:
+    def comment(self, content: str | Iterable[str]) -> CodeWriter:
         """
         Writes a comment line or block. If content is a string, it writes a single comment line.
 
@@ -77,7 +77,7 @@ def comment(self, content: Union[str, Iterable[str]]) -> CodeWriter:
             self.writeln(f"# {line}" if line else "#")
         return self
 
-    def docstring(self, content: Union[str, Iterable[str]]) -> CodeWriter:
+    def docstring(self, content: str | Iterable[str]) -> CodeWriter:
         """
         Writes a docstring. If content is a string, it writes a single-line docstring. If content is an iterable of strings, it writes a multi-line docstring.
 
@@ -128,8 +128,8 @@ def block(self, header: str) -> Generator[CodeWriter, None, None]:
     def class_(
         self,
         name: str,
-        bases: Optional[Iterable[str]] = None,
-        decorators: Optional[Iterable[str]] = None,
+        bases: Iterable[str] | None = None,
+        decorators: Iterable[str] | None = None,
     ) -> Generator[CodeWriter, None, None]:
         """
         Generate a class definition with optional base classes and decorators.
@@ -153,8 +153,8 @@ def class_(
     def dataclass(
         self,
         name: str,
-        bases: Optional[Iterable[str]] = None,
-        decorators: Optional[Iterable[str]] = None,
+        bases: Iterable[str] | None = None,
+        decorators: Iterable[str] | None = None,
         frozen: bool = False,
         slots: bool = False,
         decorator_name: str = "dataclasses.dataclass",
@@ -201,8 +201,8 @@ def enum(
         self,
         name: str,
         enum_type: str = "enum.Enum",
-        bases: Optional[Iterable[str]] = None,
-        decorators: Optional[Iterable[str]] = None,
+        bases: Iterable[str] | None = None,
+        decorators: Iterable[str] | None = None,
     ) -> Generator[CodeWriter, None, None]:
         """
         Generate an enum definition with optional base classes and decorators.
@@ -232,7 +232,7 @@ def field(
         name: str,
         type_hint: str,
         default: Any = None,
-        default_factory: Optional[str] = None,
+        default_factory: str | None = None,
     ) -> CodeWriter:
         """
         Write a dataclass field with optional default value or default factory.
@@ -268,9 +268,9 @@ def enum_member(self, name: str, value: Any) -> CodeWriter:
     def function(
         self,
         name: str,
-        params: Union[Iterable[str], str],
-        decorators: Optional[Iterable[str]] = None,
-        return_type: Optional[str] = None,
+        params: Iterable[str] | str,
+        decorators: Iterable[str] | None = None,
+        return_type: str | None = None,
     ) -> Generator[CodeWriter, None, None]:
         """
         Create a function definition with optional decorators and return type.
@@ -296,9 +296,9 @@ def function(
     def method(
         self,
         name: str,
-        params: Union[Iterable[str], str],
-        decorators: Optional[Iterable[str]] = None,
-        return_type: Optional[str] = None,
+        params: Iterable[str] | str,
+        decorators: Iterable[str] | None = None,
+        return_type: str | None = None,
     ) -> Generator[CodeWriter, None, None]:
         """
         Create a method definition within a class with optional decorators and return type.
@@ -375,7 +375,7 @@ def while_(self, condition: str) -> Generator[CodeWriter, None, None]:
             yield self
 
     def assignment(
-        self, var: str, value: str, type_hint: Optional[str] = None
+        self, var: str, value: str, type_hint: str | None = None
     ) -> CodeWriter:
         """
         Write a variable assignment with optional type hint
@@ -393,7 +393,7 @@ def assignment(
             self.writeln(f"{var} = {value}")
         return self
 
-    def return_(self, value: Optional[str] = None) -> CodeWriter:
+    def return_(self, value: str | None = None) -> CodeWriter:
         """
         Write a return statement with an optional return value
 

codegen/opentelemetry-codegen-json/tests/test_json_codec.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import math
-from typing import Optional, Union
 
 import pytest  # type: ignore
 
@@ -29,7 +28,7 @@
         (None, ""),
     ],
 )
-def test_encode_hex(value: Optional[bytes], expected: str) -> None:
+def test_encode_hex(value: bytes | None, expected: str) -> None:
     assert encode_hex(value) == expected
 
 
@@ -41,7 +40,7 @@ def test_encode_hex(value: Optional[bytes], expected: str) -> None:
         (None, b""),
     ],
 )
-def test_decode_hex(value: Optional[str], expected: bytes) -> None:
+def test_decode_hex(value: str | None, expected: bytes) -> None:
     assert decode_hex(value, "field") == expected
 
 
@@ -60,7 +59,7 @@ def test_decode_hex_errors() -> None:
         (None, ""),
     ],
 )
-def test_encode_base64(value: Optional[bytes], expected: str) -> None:
+def test_encode_base64(value: bytes | None, expected: str) -> None:
     assert encode_base64(value) == expected
 
 
@@ -72,7 +71,7 @@ def test_encode_base64(value: Optional[bytes], expected: str) -> None:
         (None, b""),
     ],
 )
-def test_decode_base64(value: Optional[str], expected: bytes) -> None:
+def test_decode_base64(value: str | None, expected: bytes) -> None:
     assert decode_base64(value, "field") == expected
 
 
@@ -101,7 +100,7 @@ def test_encode_int64(value: int, expected: str) -> None:
         (None, 0),
     ],
 )
-def test_decode_int64(value: Optional[Union[int, str]], expected: int) -> None:
+def test_decode_int64(value: int | str | None, expected: int) -> None:
     assert decode_int64(value, "field") == expected
 
 
@@ -121,7 +120,7 @@ def test_decode_int64_errors() -> None:
         (float("-inf"), "-Infinity"),
     ],
 )
-def test_encode_float(value: float, expected: Union[float, str]) -> None:
+def test_encode_float(value: float, expected: float | str) -> None:
     result = encode_float(value)
     if isinstance(expected, float) and math.isnan(expected):
         assert math.isnan(result)  # type: ignore
@@ -142,7 +141,7 @@ def test_encode_float(value: float, expected: Union[float, str]) -> None:
     ],
 )
 def test_decode_float(
-    value: Optional[Union[float, int, str]], expected: float
+    value: float | int | str | None, expected: float
 ) -> None:
     result = decode_float(value, "field")
     if math.isnan(expected):