Skip to content

Commit 39227ca

Browse files
committed
chore: enable ruff flake8-comprehensions (C4) rules and fix violations
Enable the C4 (flake8-comprehensions) rule set in ruff and fix all existing violations: - C401: Use set comprehension instead of set(generator) - C408: Use tuple literal () instead of tuple() - C417: Use generator expression / list comprehension instead of map(lambda) Addresses #4227 Assisted-by: Claude Opus 4.6
1 parent 82128af commit 39227ca

5 files changed

Lines changed: 7 additions & 10 deletions

File tree

  • codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json
  • exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc
  • opentelemetry-sdk/src/opentelemetry/sdk/util
  • shim/opentelemetry-opentracing-shim/tests/testbed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,10 @@ def _collect_imports(self, proto_file: str) -> Set[str]:
386386
Returns:
387387
Set of import statement strings
388388
"""
389-
return set(
389+
return {
390390
"import " + self._get_module_path(dep_file)
391391
for dep_file in self._file_dependencies.get(proto_file, [])
392-
)
392+
}
393393

394394
def _generate_enums_for_file(
395395
self,

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ def __init__(
328328
elif isinstance(self._headers, dict):
329329
self._headers = tuple(self._headers.items())
330330
if self._headers is None:
331-
self._headers = tuple()
331+
self._headers = ()
332332

333333
if channel_options:
334334
# merge the default channel options with the one passed as parameter

opentelemetry-sdk/src/opentelemetry/sdk/util/__init__.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,8 @@ def get_dict_as_key(labels):
3434
"""Converts a dict to be used as a unique key"""
3535
return tuple(
3636
sorted(
37-
map(
38-
lambda kv: (
39-
(kv[0], tuple(kv[1])) if isinstance(kv[1], list) else kv
40-
),
41-
labels.items(),
42-
)
37+
(kv[0], tuple(kv[1])) if isinstance(kv[1], list) else kv
38+
for kv in labels.items()
4339
)
4440
)
4541

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ select = [
8181
"F", # pyflakes
8282
"E", # pycodestyle errors
8383
"W", # pycodestyle warnings
84+
"C4", # flake8-comprehensions
8485
"PLC", # pylint convention
8586
"PLE", # pylint error
8687
"Q", # flake8-quotes

shim/opentelemetry-opentracing-shim/tests/testbed/testcase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ def assertIsNotChildOf(self, spanA, spanB):
4343
self.assertNotEqual(ctxA.span_id, ctxB.span_id)
4444

4545
def assertNamesEqual(self, spans, names):
46-
self.assertEqual(list(map(lambda x: x.name, spans)), names)
46+
self.assertEqual([x.name for x in spans], names)

0 commit comments

Comments
 (0)