Reformat with ruff.

Author: michaelsafyan

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

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import re
 import os
-from typing import Callable, Iterable, Optional, Set, Union
+import re
+from typing import Iterable, Optional, Set
 
 ALLOWED = True
 DENIED = False
@@ -31,9 +31,8 @@ def _parse_env_list(s: str) -> Set[str]:
 
 
 class _CompoundMatcher:
-
     def __init__(self, entries: Set[str]):
-        self._match_all = '*' in entries
+        self._match_all = "*" in entries
         self._entries = entries
         self._regex_matcher = None
         regex_entries = []
@@ -48,10 +47,10 @@ def __init__(self, entries: Set[str]):
             entry = entry.replace("*", ".*")
             regex_entries.append(f"({entry})")
         if regex_entries:
-            joined_regex = '|'.join(regex_entries)
+            joined_regex = "|".join(regex_entries)
             regex_str = f"^({joined_regex})$"
             self._regex_matcher = re.compile(regex_str)
-    
+
     @property
     def match_all(self):
         return self._match_all
@@ -61,7 +60,9 @@ def matches(self, x):
             return True
         if x in self._entries:
             return True
-        if (self._regex_matcher is not None) and (self._regex_matcher.fullmatch(x)):
+        if (self._regex_matcher is not None) and (
+            self._regex_matcher.fullmatch(x)
+        ):
             return True
         return False
 
@@ -74,7 +75,9 @@ def __init__(
     ):
         self._includes = _CompoundMatcher(set(includes or []))
         self._excludes = _CompoundMatcher(set(excludes or []))
-        assert ((not self._includes.match_all) or (not self._excludes.match_all)), "Can't have '*' in both includes and excludes."
+        assert (not self._includes.match_all) or (
+            not self._excludes.match_all
+        ), "Can't have '*' in both includes and excludes."
 
     def allowed(self, x: str):
         if self._excludes.match_all:

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

@@ -12,9 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import json
-from typing import Any, Callable, Dict, Optional, Protocol, Sequence, Set, Tuple, Union
+import logging
+from typing import (
+    Any,
+    Dict,
+    Optional,
+    Protocol,
+    Sequence,
+    Set,
+    Tuple,
+    Union,
+)
 
 Primitive = Union[bool, str, int, float]
 BoolList = list[bool]
@@ -27,15 +36,15 @@
 
 
 class FlattenFunc(Protocol):
-
     def __call__(
         self,
         key: str,
         value: Any,
         exclude_keys: Set[str],
         rename_keys: Dict[str, str],
         flatten_functions: Dict[str, "FlattenFunc"],
-        **kwargs: Any) -> Any:
+        **kwargs: Any,
+    ) -> Any:
         return None
 
 
@@ -152,12 +161,18 @@ def _flatten_compound_value(
             flatten_functions=flatten_functions,
         )
     if _from_json:
-        _logger.debug("Cannot flatten value with key %s; value: %s", key, value)
+        _logger.debug(
+            "Cannot flatten value with key %s; value: %s", key, value
+        )
         return {}
     try:
         json_string = json.dumps(value)
     except TypeError:
-        _logger.debug("Cannot flatten value with key %s; value: %s. Not JSON serializable.", key, value)
+        _logger.debug(
+            "Cannot flatten value with key %s; value: %s. Not JSON serializable.",
+            key,
+            value,
+        )
         return {}
     json_value = json.loads(json_string)
     return _flatten_value(

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/utils/test_allowlist_util.py

@@ -67,7 +67,9 @@ def test_includes_and_excludes():
 
 
 def test_includes_and_excludes_with_wildcards():
-    allow_list = AllowList(includes=["abc", "xyz", "xyz.*"], excludes=["xyz.foo", "xyz.foo.*"])
+    allow_list = AllowList(
+        includes=["abc", "xyz", "xyz.*"], excludes=["xyz.foo", "xyz.foo.*"]
+    )
     assert allow_list.allowed("abc")
     assert allow_list.allowed("xyz")
     assert not allow_list.allowed("xyz.foo")

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/utils/test_dict_util.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from pydantic import BaseModel
+
 from opentelemetry.instrumentation.google_genai import dict_util
 
 
@@ -208,25 +209,25 @@ def test_flatten_with_mixed_structures():
 
 def test_flatten_with_complex_object_not_json_serializable():
     result = dict_util.flatten_dict(
-            {
-                "cannot_serialize_directly": NotJsonSerializable(),
-            }
-        )
+        {
+            "cannot_serialize_directly": NotJsonSerializable(),
+        }
+    )
     assert result is not None
     assert isinstance(result, dict)
     assert len(result) == 0
 
 
 def test_flatten_good_with_non_serializable_complex_object():
     result = dict_util.flatten_dict(
-            {
-                "foo": {
-                    "bar": "blah",
-                    "baz": 5,
-                },
-                "cannot_serialize_directly": NotJsonSerializable(),
-            }
-        )
+        {
+            "foo": {
+                "bar": "blah",
+                "baz": 5,
+            },
+            "cannot_serialize_directly": NotJsonSerializable(),
+        }
+    )
     assert result == {
         "foo.bar": "blah",
         "foo.baz": 5,