diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py index 11769c729..35dcec949 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py @@ -287,9 +287,12 @@ def _instrument( span_kind = None try: - if lambda_event["Records"][0]["eventSource"] in set( - ["aws:sqs", "aws:s3", "aws:sns", "aws:dynamodb"] - ): + if lambda_event["Records"][0]["eventSource"] in { + "aws:sqs", + "aws:s3", + "aws:sns", + "aws:dynamodb", + }: # See more: # https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html # https://docs.aws.amazon.com/lambda/latest/dg/with-sns.html diff --git a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py index b94cc744b..9f48d2c63 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/__init__.py @@ -178,8 +178,6 @@ class BotoInstrumentor(BaseInstrumentor): ) def _patched_auth_request(self, original_func, instance, args, kwargs): - operation_name = None - frame = currentframe().f_back operation_name = None while frame: diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py index a2c434c6c..3b2767e27 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py @@ -130,7 +130,7 @@ class ElasticsearchInstrumentor(BaseInstrumentor): def _instrument(self, **kwargs): """ - Instruments elasticsearch module + Instruments Elasticsearch module """ tracer_provider = kwargs.get("tracer_provider") tracer = get_tracer(__name__, __version__, tracer_provider) diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py index 6cb39c7e2..45da04985 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py @@ -266,7 +266,6 @@ _excluded_urls_from_env = get_excluded_urls("FLASK") def get_default_span_name(): - span_name = "" try: span_name = flask.request.url_rule.rule except AttributeError: diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py index 91cd81aab..4e9ae8a14 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/__init__.py @@ -194,7 +194,7 @@ class CommandTracer(monitoring.CommandListener): def _get_span_dict_key(event): if event.connection_id is not None: - return (event.request_id, event.connection_id) + return event.request_id, event.connection_id return event.request_id diff --git a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py index 1b0b714fa..b85c2336b 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/__init__.py @@ -142,7 +142,6 @@ def _instrument( ): def _traced_execute_command(func, instance, args, kwargs): query = _format_command_args(args) - name = "" if len(args) > 0 and args[0]: name = args[0] else: diff --git a/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py index 420bad5d6..413c61ba8 100644 --- a/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-system-metrics/src/opentelemetry/instrumentation/system_metrics/__init__.py @@ -78,7 +78,7 @@ from typing import Collection, Dict, Iterable, List, Optional import psutil -# FIXME Remove this pyling disabling line when Github issue is cleared +# FIXME Remove this pylint disabling line when Github issue is cleared # pylint: disable=no-name-in-module from opentelemetry.instrumentation.instrumentor import BaseInstrumentor from opentelemetry.instrumentation.system_metrics.package import _instruments