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