Skip to content

Commit ea34a01

Browse files
committed
Fix lint
1 parent c89052c commit ea34a01

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ lint.ignore = [
9090
"RET505",
9191
"ISC001",
9292
"UP035",
93+
"COM812",
9394
]
9495

9596
[tool.ruff.lint.per-file-ignores]

src/asgi_monitor/integrations/litestar.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434

3535
def _get_default_span_details(scope: Scope) -> tuple[str, dict[str, Any]]:
36-
method, path = scope["method"], scope["path"] # The WebSocket is not supported
36+
method, path = scope["method"], scope["path"] # type: ignore[typeddict-item] # The WebSocket is not supported
3737
return f"{method} {path}", {SpanAttributes.HTTP_ROUTE: path}
3838

3939

@@ -74,7 +74,7 @@ def __init__(self, app: ASGIApp, config: TracingConfig) -> None:
7474
self.open_telemetry_middleware = build_open_telemetry_middleware(app, config)
7575

7676
async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
77-
return await self.open_telemetry_middleware(scope, receive, send) # type: ignore[no-any-return]
77+
return await self.open_telemetry_middleware(scope, receive, send) # type: ignore[arg-type]
7878

7979

8080
def _get_wrapped_send(send: Send, request_span: dict[str, float]) -> Callable:
@@ -146,7 +146,7 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
146146
self.metrics.inc_responses_count(
147147
method=method,
148148
path=path,
149-
status_code=request_span["status_code"],
149+
status_code=request_span["status_code"], # type: ignore[arg-type]
150150
)
151151
self.metrics.remove_request_in_progress(method=method, path=path)
152152

src/asgi_monitor/integrations/starlette.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ async def __call__(
115115
if scope["type"] != "http":
116116
return await self.app(scope, receive, send)
117117

118-
return await self.open_telemetry_middleware(scope, receive, send) # type: ignore[no-any-return]
118+
return await self.open_telemetry_middleware(scope, receive, send) # type: ignore[arg-type]
119119

120120

121121
class MetricsMiddleware(BaseHTTPMiddleware):

src/asgi_monitor/logging/configure.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def _configure_default_logging(
7171

7272
formatter = structlog.stdlib.ProcessorFormatter(
7373
foreign_pre_chain=default_processors,
74-
processors=logging_processors,
74+
processors=logging_processors, # type: ignore[arg-type]
7575
)
7676

7777
handler = logging.StreamHandler(stream=sys.stdout)

src/asgi_monitor/logging/trace_processor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def extract_opentelemetry_trace_meta(
1818
return event_dict
1919

2020
ctx = span.get_span_context()
21-
service_name = trace.get_tracer_provider().resource.attributes["service.name"]
21+
service_name = trace.get_tracer_provider().resource.attributes["service.name"] # type: ignore[attr-defined]
2222
parent = getattr(span, "parent", None)
2323

2424
event_dict["span_id"] = trace.format_span_id(ctx.span_id)

src/asgi_monitor/logging/uvicorn/log_config.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
5252
]
5353

5454
super().__init__(
55-
processors=processors,
55+
processors=processors, # type: ignore[arg-type]
5656
foreign_pre_chain=_build_default_processors(json_format=False),
5757
pass_foreign_args=True, # for args from record.args in positional_args
5858
)
@@ -68,7 +68,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
6868
]
6969

7070
super().__init__(
71-
processors=processors,
71+
processors=processors, # type: ignore[arg-type]
7272
foreign_pre_chain=_build_default_processors(json_format=False),
7373
pass_foreign_args=True, # for args from record.args in positional_args
7474
)
@@ -91,7 +91,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
9191
]
9292

9393
super().__init__(
94-
processors=processors,
94+
processors=processors, # type: ignore[arg-type]
9595
foreign_pre_chain=_build_default_processors(json_format=True),
9696
pass_foreign_args=True, # for args from record.args in positional_args
9797
)
@@ -107,7 +107,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
107107
]
108108

109109
super().__init__(
110-
processors=processors,
110+
processors=processors, # type: ignore[arg-type]
111111
foreign_pre_chain=_build_default_processors(json_format=True),
112112
pass_foreign_args=True, # for args from record.args in positional_args
113113
)
@@ -134,7 +134,7 @@ def build_uvicorn_log_config(
134134
default = UvicornDefaultJSONFormatter
135135
access = UvicornAccessJSONFormatter if not include_trace else TraceUvicornAccessJSONFormatter
136136
else:
137-
default = UvicornDefaultConsoleFormatter
137+
default = UvicornDefaultConsoleFormatter # type: ignore[assignment]
138138
access = UvicornAccessConsoleFormatter if not include_trace else TraceUvicornAccessConsoleFormatter
139139

140140
return {

tests/unit/metrics/test_metrics.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,17 @@ def test_request_duration(container: MetricsContainer, manager: MetricsManager)
116116
"histogram",
117117
"",
118118
)
119+
bucket_labels = {"app_name": "asgi-monitor", "method": "GET", "path": "/metrics", "le": IsStr}
119120
expected_sample_bucket_with_exemplar = Sample(
120121
name="test_request_duration_seconds_bucket",
121-
labels={"app_name": "asgi-monitor", "method": "GET", "path": "/metrics", "le": IsStr},
122+
labels=bucket_labels, # type: ignore[arg-type]
122123
value=1.0,
123124
timestamp=None,
124125
exemplar=Exemplar(labels={"TraceID": "1234567"}, value=0.0, timestamp=FROZEN_TIMESTAMP),
125126
)
126127
expected_sample_bucket_without_exemplar = Sample(
127128
name="test_request_duration_seconds_bucket",
128-
labels={"app_name": "asgi-monitor", "method": "GET", "path": "/metrics", "le": IsStr},
129+
labels=bucket_labels, # type: ignore[arg-type]
129130
value=1.0,
130131
timestamp=None,
131132
exemplar=None,
@@ -165,7 +166,7 @@ def test_request_duration(container: MetricsContainer, manager: MetricsManager)
165166

166167
# Assert
167168
request_duration = container.request_duration().collect()
168-
samples = request_duration[0].samples
169+
samples = request_duration[0].samples # type: ignore[index]
169170

170171
assert_that(request_duration).extracting("name", "documentation", "type", "unit").is_equal_to([expected])
171172
assert_that(samples[0]).is_equal_to(expected_sample_bucket_with_exemplar)

0 commit comments

Comments
 (0)