diff --git a/CHANGELOG.md b/CHANGELOG.md index d9e48cd6df..b0ce56d9b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Enabled the flake8-tidy-import plugins rules for the ruff linter. These rules throw warnings for relative imports in the modules. +([#4395](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4395)) - `opentelemetry-instrumentation-asgi`: Respect `suppress_http_instrumentation` context in ASGI middleware to skip server span creation when HTTP instrumentation is suppressed ([#4375](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4375)) - `opentelemetry-instrumentation-confluent-kafka`: Loosen confluent-kafka upper bound to <3.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py b/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py index 028009afd6..7b5541d429 100644 --- a/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/__init__.py @@ -188,7 +188,7 @@ def _safe_end_processing_span(receipt_handle: str) -> None: @staticmethod def _extract_queue_name_from_url(queue_url: str) -> str: # A Queue name cannot have the `/` char, therefore we can return the part after the last / - return queue_url.split("/")[-1] + return queue_url.rsplit("/", maxsplit=1)[-1] def _create_processing_span( self, diff --git a/pyproject.toml b/pyproject.toml index c877d5f038..c7374ec023 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -171,6 +171,7 @@ select = [ "PLE", # pylint error "Q", # flake8-quotes "A", # flake8-builtins + "TID", # flake8-tidy-imports ] ignore = [ "E501", # line-too-long @@ -178,6 +179,7 @@ ignore = [ [tool.ruff.lint.per-file-ignores] "docs/**/*.*" = ["A001"] +"instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/*" = ["TID252"] [tool.ruff.lint.isort] detect-same-package = false # to not consider instrumentation packages as first-party