Skip to content

Commit 81134bd

Browse files
committed
style: fix error [SIM300] - Yoda condition detected.
Used Ruff (vscode and pre-commit) to: - Black-compatible code formatting. - fix all auto-fixable violations. - isort-compatible import sorting. - flake8-simplify manual fixes. Signed-off-by: Paulo Vital <paulo.vital@ibm.com>
1 parent 9a0708e commit 81134bd

23 files changed

Lines changed: 259 additions & 247 deletions

src/instana/instrumentation/aiohttp/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async def stan_request_end(
6565

6666
extract_custom_headers(span, params.response.headers)
6767

68-
if 500 <= params.response.status:
68+
if params.response.status >= 500:
6969
span.mark_as_errored({"http.error": params.response.reason})
7070

7171
if span.is_recording():

src/instana/instrumentation/asgi.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
if TYPE_CHECKING:
1919
from starlette.middleware.exceptions import ExceptionMiddleware
20+
2021
from instana.span.span import InstanaSpan
2122

2223

@@ -34,7 +35,7 @@ def _collect_kvs(self, scope: Dict[str, Any], span: "InstanaSpan") -> None:
3435
span.set_attribute(SpanAttributes.HTTP_METHOD, scope.get("method"))
3536

3637
server = scope.get("server")
37-
if isinstance(server, tuple) or isinstance(server, list):
38+
if isinstance(server, (tuple, list)):
3839
span.set_attribute(SpanAttributes.HTTP_HOST, server[0])
3940

4041
query = scope.get("query_string")
@@ -102,7 +103,7 @@ async def send_wrapper(response: Dict[str, Any]) -> Awaitable[None]:
102103
try:
103104
status_code = response.get("status")
104105
if status_code:
105-
if 500 <= int(status_code):
106+
if int(status_code) >= 500:
106107
current_span.mark_as_errored()
107108
current_span.set_attribute(
108109
SpanAttributes.HTTP_STATUS_CODE, status_code

src/instana/instrumentation/aws/lambda_inst.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def lambda_handler_with_instana(
5555
if "statusCode" in result and result.get("statusCode"):
5656
status_code = int(result["statusCode"])
5757
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
58-
if 500 <= status_code:
58+
if status_code >= 500:
5959
span.record_exception(f"HTTP status {status_code}")
6060
except Exception as exc:
6161
logger.debug(f"AWS Lambda lambda_handler_with_instana error: {exc}")

src/instana/instrumentation/django/middleware.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def process_response(
9494
) -> "HttpResponse":
9595
try:
9696
if request.span:
97-
if 500 <= response.status_code:
97+
if response.status_code >= 500:
9898
request.span.assure_errored()
9999
# for django >= 2.2
100100
if request.resolver_match is not None and hasattr(

src/instana/instrumentation/flask/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def handle_user_exception_with_instana(
8282
else:
8383
status_code = response.status_code
8484

85-
if 500 <= status_code:
85+
if status_code >= 500:
8686
span.record_exception(exc)
8787

8888
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, int(status_code))
@@ -147,7 +147,7 @@ def inject_span(
147147

148148
span = flask.g.span
149149
if span:
150-
if 500 <= response.status_code:
150+
if response.status_code >= 500:
151151
span.mark_as_errored()
152152

153153
span.set_attribute(

src/instana/instrumentation/httpx.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def _set_response_span_attributes(
5858

5959
status_code = response.status_code
6060
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
61-
if 500 <= status_code:
61+
if status_code >= 500:
6262
span.mark_as_errored()
6363
except Exception:
6464
logger.debug("httpx _set_request_span_attributes error: ", exc_info=True)

src/instana/instrumentation/sanic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def exception_with_instana(request: Request, exception: Exception) -> None:
9292
status_code = exception.status_code
9393
message = str(exception)
9494

95-
if all([span, status_code, message]) and 500 <= status_code:
95+
if all([span, status_code, message]) and status_code >= 500:
9696
span.set_attribute("http.error", message)
9797
except Exception:
9898
logger.debug("exception_with_instana: ", exc_info=True)

src/instana/instrumentation/tornado/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def on_finish_with_instana(
9696
status_code = instance.get_status()
9797

9898
# Mark 500 responses as errored
99-
if 500 <= status_code:
99+
if status_code >= 500:
100100
span.mark_as_errored()
101101

102102
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)

src/instana/instrumentation/urllib3.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def _collect_kvs(
5555

5656
# Only construct URL if host is not None
5757
if kvs.get("host") and kvs.get("path"):
58-
url = f'{kvs["host"]}:{kvs["port"]}{kvs["path"]}'
58+
url = f"{kvs['host']}:{kvs['port']}{kvs['path']}"
5959
if isinstance(instance, urllib3.connectionpool.HTTPSConnectionPool):
6060
kvs["url"] = f"https://{url}"
6161
else:
@@ -74,7 +74,7 @@ def collect_response(
7474

7575
extract_custom_headers(span, response.headers)
7676

77-
if 500 <= response.status:
77+
if response.status >= 500:
7878
span.mark_as_errored()
7979
except Exception:
8080
logger.debug("urllib3 collect_response error: ", exc_info=True)

src/instana/instrumentation/wsgi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def new_start_response(
6262

6363
# Set status code attribute
6464
sc = status.split(" ")[0]
65-
if 500 <= int(sc):
65+
if int(sc) >= 500:
6666
span.mark_as_errored()
6767

6868
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, sc)

0 commit comments

Comments
 (0)