Chore: Updated references using pyupgrade

Author: jomcgi

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/__init__.py

@@ -16,7 +16,8 @@
 import re
 from collections import defaultdict
 from itertools import chain
-from typing import Dict, Mapping, Sequence
+from typing import Dict
+from collections.abc import Mapping, Sequence
 
 import requests
 import snappy
@@ -71,14 +72,14 @@ class PrometheusRemoteWriteMetricsExporter(MetricExporter):
     def __init__(
         self,
         endpoint: str,
-        basic_auth: Dict = None,
-        headers: Dict = None,
+        basic_auth: dict = None,
+        headers: dict = None,
         timeout: int = 30,
-        tls_config: Dict = None,
-        proxies: Dict = None,
+        tls_config: dict = None,
+        proxies: dict = None,
         resources_as_labels: bool = True,
-        preferred_temporality: Dict[type, AggregationTemporality] = None,
-        preferred_aggregation: Dict = None,
+        preferred_temporality: dict[type, AggregationTemporality] = None,
+        preferred_aggregation: dict = None,
     ):
         self.endpoint = endpoint
         self.basic_auth = basic_auth
@@ -115,7 +116,7 @@ def basic_auth(self):
         return self._basic_auth
 
     @basic_auth.setter
-    def basic_auth(self, basic_auth: Dict):
+    def basic_auth(self, basic_auth: dict):
         if basic_auth:
             if "username" not in basic_auth:
                 raise ValueError("username required in basic_auth")
@@ -147,7 +148,7 @@ def tls_config(self):
         return self._tls_config
 
     @tls_config.setter
-    def tls_config(self, tls_config: Dict):
+    def tls_config(self, tls_config: dict):
         if tls_config:
             new_config = {}
             if "ca_file" in tls_config:
@@ -170,15 +171,15 @@ def proxies(self):
         return self._proxies
 
     @proxies.setter
-    def proxies(self, proxies: Dict):
+    def proxies(self, proxies: dict):
         self._proxies = proxies
 
     @property
     def headers(self):
         return self._headers
 
     @headers.setter
-    def headers(self, headers: Dict):
+    def headers(self, headers: dict):
         self._headers = headers
 
     def export(
@@ -355,7 +356,7 @@ def _build_message(timeseries: Sequence[TimeSeries]) -> bytes:
         serialized_message = write_request.SerializeToString()
         return snappy.compress(serialized_message)
 
-    def _build_headers(self) -> Dict:
+    def _build_headers(self) -> dict:
         headers = {
             "Content-Encoding": "snappy",
             "Content-Type": "application/x-protobuf",
@@ -367,7 +368,7 @@ def _build_headers(self) -> Dict:
         return headers
 
     def _send_message(
-        self, message: bytes, headers: Dict
+        self, message: bytes, headers: dict
     ) -> MetricExportResult:
         auth = None
         if self.basic_auth:

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py

@@ -314,18 +314,18 @@ def test_invalid_export(prom_rw):
 @patch("requests.post")
 def test_valid_send_message(mock_post, prom_rw):
     mock_post.return_value.configure_mock(**{"ok": True})
-    result = prom_rw._send_message(bytes(), {})
+    result = prom_rw._send_message(b'', {})
     assert mock_post.call_count == 1
     assert result == MetricExportResult.SUCCESS
 
 
 def test_invalid_send_message(prom_rw):
-    result = prom_rw._send_message(bytes(), {})
+    result = prom_rw._send_message(b'', {})
     assert result == MetricExportResult.FAILURE
 
 
 # Verifies that build_message calls snappy.compress and returns SerializedString
-@patch("snappy.compress", return_value=bytes())
+@patch("snappy.compress", return_value=b'')
 def test_build_message(mock_compress, prom_rw):
     message = prom_rw._build_message([TimeSeries()])
     assert mock_compress.call_count == 1

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py

@@ -165,7 +165,7 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
         return SpanExportResult.SUCCESS
 
     @staticmethod
-    def spans_to_tree(spans: typing.Sequence[ReadableSpan]) -> Dict[str, Tree]:
+    def spans_to_tree(spans: typing.Sequence[ReadableSpan]) -> dict[str, Tree]:
         trees = {}
         parents = {}
         spans = list(spans)

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py

@@ -17,7 +17,8 @@
 import logging
 import os
 import time
-from typing import Any, AsyncIterator, Awaitable, Iterator, Optional, Union
+from typing import Any, Optional, Union
+from collections.abc import AsyncIterator, Awaitable, Iterator
 
 from google.genai.models import AsyncModels, Models
 from google.genai.types import (

exporter/opentelemetry-exporter-prometheus-remote-write/tests/test_prometheus_remote_write_exporter.py

@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Any, Collection
+from typing import Any
+from collections.abc import Collection
 
 from opentelemetry._events import get_event_logger_provider
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/__init__.py

@@ -121,8 +121,7 @@ def _create_stream_mock(self):
         mock = unittest.mock.MagicMock()
 
         def _default_impl(*args, **kwargs):
-            for response in self._responses:
-                yield response
+            yield from self._responses
 
         mock.side_effect = _default_impl
         return mock

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py

@@ -40,7 +40,7 @@
 ---
 """
 
-from typing import Collection
+from collections.abc import Collection
 
 from wrapt import wrap_function_wrapper
 

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/instrumentor.py

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 from os import environ
-from typing import Mapping, Optional, Union
+from typing import Optional, Union
+from collections.abc import Mapping
 from urllib.parse import urlparse
 
 from httpx import URL

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/base.py

@@ -41,7 +41,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Collection
+from typing import Any
+from collections.abc import Collection
 
 from wrapt import (
     wrap_function_wrapper,  # type: ignore[reportUnknownVariableType]

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/__init__.py

@@ -23,7 +23,8 @@
 from __future__ import annotations
 
 from dataclasses import asdict, dataclass
-from typing import Any, Iterable, Literal
+from typing import Any, Literal
+from collections.abc import Iterable
 
 from opentelemetry._events import Event
 from opentelemetry.semconv._incubating.attributes import gen_ai_attributes

instrumentation-genai/opentelemetry-instrumentation-openai-v2/src/opentelemetry/instrumentation/openai_v2/utils.py

@@ -18,10 +18,9 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Awaitable,
     Callable,
-    MutableSequence,
 )
+from collections.abc import Awaitable, MutableSequence
 
 from opentelemetry._events import EventLogger
 from opentelemetry.instrumentation.vertexai.utils import (

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/__init__.py

@@ -19,11 +19,9 @@
 from os import environ
 from typing import (
     TYPE_CHECKING,
-    Iterable,
-    Mapping,
-    Sequence,
     cast,
 )
+from collections.abc import Iterable, Mapping, Sequence
 from urllib.parse import urlparse
 
 from google.protobuf import json_format

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/events.py

@@ -3,7 +3,8 @@
 import json
 import os
 import re
-from typing import Any, Mapping, MutableMapping
+from typing import Any
+from collections.abc import Mapping, MutableMapping
 
 import pytest
 import vertexai

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/patch.py

@@ -4,10 +4,10 @@
 from typing import (
     Any,
     Callable,
-    Generator,
     Protocol,
     TypeVar,
 )
+from collections.abc import Generator
 
 import pytest
 from google.api_core.exceptions import BadRequest, NotFound
@@ -72,7 +72,7 @@ def test_generate_content(
     # Emits user and choice events
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
-    user_log, choice_log = [log_data.log_record for log_data in logs]
+    user_log, choice_log = (log_data.log_record for log_data in logs)
 
     span_context = spans[0].get_span_context()
     assert user_log.trace_id == span_context.trace_id
@@ -142,7 +142,7 @@ def test_generate_content_without_events(
     # Emits user and choice event without body.content
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
-    user_log, choice_log = [log_data.log_record for log_data in logs]
+    user_log, choice_log = (log_data.log_record for log_data in logs)
     assert user_log.attributes == {
         "gen_ai.system": "vertex_ai",
         "event.name": "gen_ai.user.message",
@@ -414,9 +414,9 @@ def generate_content_all_input_events(
     # Emits a system event, 2 users events, an assistant event, and the choice (response) event
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 5
-    system_log, user_log1, assistant_log, user_log2, choice_log = [
+    system_log, user_log1, assistant_log, user_log2, choice_log = (
         log_data.log_record for log_data in logs
-    ]
+    )
 
     assert system_log.attributes == {
         "gen_ai.system": "vertex_ai",
@@ -497,7 +497,7 @@ def __call__(self): ...
 def fixture_generate_content(
     request: pytest.FixtureRequest,
     vcr: VCR,
-) -> Generator[GenerateContentFixture, None, None]:
+) -> Generator[GenerateContentFixture]:
     """This fixture parameterizes tests that use it to test calling both
     GenerativeModel.generate_content() and GenerativeModel.generate_content_async().
     """

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/utils.py

@@ -43,7 +43,7 @@ def test_function_call_choice(
     # Emits user and choice events
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
-    user_log, choice_log = [log_data.log_record for log_data in logs]
+    user_log, choice_log = (log_data.log_record for log_data in logs)
     assert user_log.attributes == {
         "gen_ai.system": "vertex_ai",
         "event.name": "gen_ai.user.message",
@@ -110,7 +110,7 @@ def test_function_call_choice_no_content(
     # Emits user and choice events
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
-    user_log, choice_log = [log_data.log_record for log_data in logs]
+    user_log, choice_log = (log_data.log_record for log_data in logs)
     assert user_log.attributes == {
         "gen_ai.system": "vertex_ai",
         "event.name": "gen_ai.user.message",
@@ -169,9 +169,9 @@ def test_tool_events(
     # Emits user, assistant, two tool, and choice events
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 5
-    user_log, assistant_log, tool_log1, tool_log2, choice_log = [
+    user_log, assistant_log, tool_log1, tool_log2, choice_log = (
         log_data.log_record for log_data in logs
-    ]
+    )
     assert user_log.attributes == {
         "gen_ai.system": "vertex_ai",
         "event.name": "gen_ai.user.message",
@@ -271,9 +271,9 @@ def test_tool_events_no_content(
     # Emits user, assistant, two tool, and choice events
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 5
-    user_log, assistant_log, tool_log1, tool_log2, choice_log = [
+    user_log, assistant_log, tool_log1, tool_log2, choice_log = (
         log_data.log_record for log_data in logs
-    ]
+    )
     assert user_log.attributes == {
         "gen_ai.system": "vertex_ai",
         "event.name": "gen_ai.user.message",

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/conftest.py

@@ -11,7 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Any, Callable, Collection
+from typing import Any, Callable
+from collections.abc import Collection
 
 import wrapt
 from aio_pika import Exchange, Queue

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_chat_completions.py

@@ -11,6 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from typing import Collection
+from collections.abc import Collection
 
 _instruments: Collection[str] = ("aio_pika >= 7.2.0, < 10.0.0",)

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling.py

@@ -70,7 +70,7 @@ def test_get_publish_span(self):
             attributes=self.EXPECTED_ATTRIBUTES,
         )
 
-    def _test_publish(self, exchange_type: Type[Exchange]):
+    def _test_publish(self, exchange_type: type[Exchange]):
         exchange = exchange_type(CONNECTION_7, CHANNEL_7, EXCHANGE_NAME)
         with mock.patch.object(
             PublishDecorator, "_get_publish_span"
@@ -149,7 +149,7 @@ def test_get_publish_span(self):
             attributes=self.EXPECTED_ATTRIBUTES,
         )
 
-    def _test_publish(self, exchange_type: Type[Exchange]):
+    def _test_publish(self, exchange_type: type[Exchange]):
         exchange = exchange_type(CONNECTION_8, CHANNEL_8, EXCHANGE_NAME)
         with mock.patch.object(
             PublishDecorator, "_get_publish_span"

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/aio_pika_instrumentor.py

@@ -90,7 +90,7 @@ def response_hook(span: Span, params: typing.Union[
 
 import types
 import typing
-from typing import Collection
+from collections.abc import Collection
 
 import aiohttp
 import wrapt

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/package.py

@@ -51,7 +51,7 @@
 
 def run_with_test_server(
     runnable: typing.Callable, url: str, handler: typing.Callable
-) -> typing.Tuple[str, int]:
+) -> tuple[str, int]:
     async def do_request():
         app = aiohttp.web.Application()
         parsed_url = urllib.parse.urlparse(url)
@@ -107,7 +107,7 @@ def _http_request(
         status_code: int = HTTPStatus.OK,
         request_handler: typing.Callable = None,
         **kwargs,
-    ) -> typing.Tuple[str, int]:
+    ) -> tuple[str, int]:
         """Helper to start an aiohttp test server and send an actual HTTP request to it."""
 
         async def default_handler(request):