diff --git a/src/instana/instrumentation/aioamqp.py b/src/instana/instrumentation/aioamqp.py index ad973f78..49c1729a 100644 --- a/src/instana/instrumentation/aioamqp.py +++ b/src/instana/instrumentation/aioamqp.py @@ -18,7 +18,7 @@ async def basic_publish_with_instana( argv: Tuple[object, Tuple[object, ...]], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return await wrapped(*argv, **kwargs) @@ -58,7 +58,7 @@ async def basic_consume_with_instana( argv: Tuple[object, Tuple[object, ...]], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return await wrapped(*argv, **kwargs) diff --git a/src/instana/instrumentation/aiohttp/client.py b/src/instana/instrumentation/aiohttp/client.py index 3b4e833a..a05c1031 100644 --- a/src/instana/instrumentation/aiohttp/client.py +++ b/src/instana/instrumentation/aiohttp/client.py @@ -27,7 +27,7 @@ async def stan_request_start( session: "ClientSession", trace_config_ctx: SimpleNamespace, params ) -> Awaitable[None]: try: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: trace_config_ctx.span_context = None diff --git a/src/instana/instrumentation/aws/boto3.py b/src/instana/instrumentation/aws/boto3.py index 2da62ca2..23d97150 100644 --- a/src/instana/instrumentation/aws/boto3.py +++ b/src/instana/instrumentation/aws/boto3.py @@ -23,7 +23,6 @@ from instana.log import logger from instana.propagators.format import Format - from instana.singletons import get_tracer from instana.util.traceutils import extract_custom_headers, get_tracer_tuple def lambda_inject_context( @@ -37,7 +36,6 @@ def lambda_inject_context( https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/lambda.html#Lambda.Client.invoke """ try: - tracer = get_tracer() invoke_payload = payload.get("Payload", {}) if not isinstance(invoke_payload, dict): @@ -67,7 +65,7 @@ def make_api_call_with_instana( args: Sequence[Dict[str, Any]], kwargs: Dict[str, Any], ) -> Dict[str, Any]: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/aws/s3.py b/src/instana/instrumentation/aws/s3.py index 9b1557b5..bb6acc80 100644 --- a/src/instana/instrumentation/aws/s3.py +++ b/src/instana/instrumentation/aws/s3.py @@ -47,7 +47,7 @@ def collect_s3_injected_attributes( args: Sequence[object], kwargs: Dict[str, Any], ) -> Callable[..., object]: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/cassandra.py b/src/instana/instrumentation/cassandra.py index dad1b11d..b2ddc8a4 100644 --- a/src/instana/instrumentation/cassandra.py +++ b/src/instana/instrumentation/cassandra.py @@ -73,7 +73,7 @@ def cb_request_error( def request_init_with_instana( fn: "ResponseFuture", ) -> None: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return diff --git a/src/instana/instrumentation/celery.py b/src/instana/instrumentation/celery.py index f0648212..9fc4161f 100644 --- a/src/instana/instrumentation/celery.py +++ b/src/instana/instrumentation/celery.py @@ -145,7 +145,7 @@ def before_task_publish( **kwargs: Dict[str, Any], ) -> None: try: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return diff --git a/src/instana/instrumentation/couchbase.py b/src/instana/instrumentation/couchbase.py index ee00ce5f..d5429fb1 100644 --- a/src/instana/instrumentation/couchbase.py +++ b/src/instana/instrumentation/couchbase.py @@ -94,7 +94,7 @@ def wrapper( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return wrapped(*args, **kwargs) @@ -120,7 +120,7 @@ def query_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/google/cloud/pubsub.py b/src/instana/instrumentation/google/cloud/pubsub.py index 03b8354f..b06d3350 100644 --- a/src/instana/instrumentation/google/cloud/pubsub.py +++ b/src/instana/instrumentation/google/cloud/pubsub.py @@ -50,7 +50,7 @@ def publish_with_instana( """References: - PublisherClient.publish(topic_path, messages, metadata) """ - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # return early if we're not tracing if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/google/cloud/storage.py b/src/instana/instrumentation/google/cloud/storage.py index 0720c353..6726f22b 100644 --- a/src/instana/instrumentation/google/cloud/storage.py +++ b/src/instana/instrumentation/google/cloud/storage.py @@ -62,7 +62,7 @@ def execute_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # batch requests are traced with finish_batch_with_instana() # also return early if we're not tracing @@ -94,7 +94,7 @@ def download_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # return early if we're not tracing if not tracer: return wrapped(*args, **kwargs) @@ -130,7 +130,7 @@ def upload_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # return early if we're not tracing if not tracer: return wrapped(*args, **kwargs) @@ -155,7 +155,7 @@ def finish_batch_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # return early if we're not tracing if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/httpx.py b/src/instana/instrumentation/httpx.py index f74f1d13..7a07d782 100644 --- a/src/instana/instrumentation/httpx.py +++ b/src/instana/instrumentation/httpx.py @@ -70,7 +70,7 @@ def handle_request_with_instana( args: Tuple[int, str, Tuple[Any, ...]], kwargs: Dict[str, Any], ) -> httpx.Response: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return wrapped(*args, **kwargs) @@ -99,7 +99,7 @@ async def handle_async_request_with_instana( args: Tuple[int, str, Tuple[Any, ...]], kwargs: Dict[str, Any], ) -> httpx.Response: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: return await wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/kafka/confluent_kafka_python.py b/src/instana/instrumentation/kafka/confluent_kafka_python.py index 603a5433..7e056a72 100644 --- a/src/instana/instrumentation/kafka/confluent_kafka_python.py +++ b/src/instana/instrumentation/kafka/confluent_kafka_python.py @@ -66,7 +66,7 @@ def trace_kafka_produce( args: Tuple[int, str, Tuple[Any, ...]], kwargs: Dict[str, Any], ) -> None: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/kafka/kafka_python.py b/src/instana/instrumentation/kafka/kafka_python.py index 44bd0ebd..6259836b 100644 --- a/src/instana/instrumentation/kafka/kafka_python.py +++ b/src/instana/instrumentation/kafka/kafka_python.py @@ -31,7 +31,7 @@ def trace_kafka_send( args: Tuple[int, str, Tuple[Any, ...]], kwargs: Dict[str, Any], ) -> "FutureRecordMetadata": - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() if not tracer: return wrapped(*args, **kwargs) diff --git a/src/instana/instrumentation/logging.py b/src/instana/instrumentation/logging.py index 0c8656d0..cc1dfa0f 100644 --- a/src/instana/instrumentation/logging.py +++ b/src/instana/instrumentation/logging.py @@ -35,7 +35,7 @@ def log_with_instana( stacklevel = stacklevel_in + 1 try: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # Only needed if we're tracing and serious log and logging spans are not disabled if ( not tracer diff --git a/src/instana/instrumentation/pep0249.py b/src/instana/instrumentation/pep0249.py index c636ba5c..7ea8efaa 100644 --- a/src/instana/instrumentation/pep0249.py +++ b/src/instana/instrumentation/pep0249.py @@ -67,7 +67,7 @@ def execute( sql: str, params: Optional[Dict[str, Any]] = None, ) -> Callable[[str, Dict[str, Any]], None]: - tracer, parent_span, operation_name = get_tracer_tuple() + tracer, _, operation_name = get_tracer_tuple() # If not tracing or we're being called from sqlalchemy, just pass through if not tracer or (operation_name == "sqlalchemy"): @@ -92,7 +92,7 @@ def executemany( sql: str, seq_of_parameters: List[Dict[str, Any]], ) -> Callable[[str, List[Dict[str, Any]]], None]: - tracer, parent_span, operation_name = get_tracer_tuple() + tracer, _, operation_name = get_tracer_tuple() # If not tracing or we're being called from sqlalchemy, just pass through if not tracer or (operation_name == "sqlalchemy"): @@ -117,7 +117,7 @@ def callproc( proc_name: str, params: Dict[str, Any], ) -> Callable[[str, Dict[str, Any]], None]: - tracer, parent_span, operation_name = get_tracer_tuple() + tracer, _, operation_name = get_tracer_tuple() # If not tracing or we're being called from sqlalchemy, just pass through if not tracer or (operation_name == "sqlalchemy"): diff --git a/src/instana/instrumentation/pika.py b/src/instana/instrumentation/pika.py index 77c18063..75bb7a3d 100644 --- a/src/instana/instrumentation/pika.py +++ b/src/instana/instrumentation/pika.py @@ -74,7 +74,7 @@ def _bind_args( ) -> Tuple[object, ...]: return (exchange, routing_key, body, properties, args, kwargs) - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: diff --git a/src/instana/instrumentation/pymongo.py b/src/instana/instrumentation/pymongo.py index 364db85a..68547380 100644 --- a/src/instana/instrumentation/pymongo.py +++ b/src/instana/instrumentation/pymongo.py @@ -17,7 +17,7 @@ def __init__(self) -> None: self.__active_commands = {} def started(self, event: pymongo.monitoring.CommandStartedEvent) -> None: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # return early if we're not tracing if not tracer: return diff --git a/src/instana/instrumentation/redis.py b/src/instana/instrumentation/redis.py index 208b0f0a..d583c4f6 100644 --- a/src/instana/instrumentation/redis.py +++ b/src/instana/instrumentation/redis.py @@ -44,7 +44,7 @@ def execute_command_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, operation_name = get_tracer_tuple() + tracer, _, operation_name = get_tracer_tuple() # If we're not tracing, just return if not tracer or (operation_name in EXCLUDED_PARENT_SPANS): @@ -71,7 +71,7 @@ def execute_with_instana( args: Tuple[object, ...], kwargs: Dict[str, Any], ) -> object: - tracer, parent_span, operation_name = get_tracer_tuple() + tracer, _, operation_name = get_tracer_tuple() # If we're not tracing, just return if not tracer or (operation_name in EXCLUDED_PARENT_SPANS): diff --git a/src/instana/instrumentation/sqlalchemy.py b/src/instana/instrumentation/sqlalchemy.py index 652f16bd..6037eb73 100644 --- a/src/instana/instrumentation/sqlalchemy.py +++ b/src/instana/instrumentation/sqlalchemy.py @@ -25,7 +25,7 @@ def receive_before_cursor_execute( **kw: Dict[str, Any], ) -> None: try: - tracer, parent_span, _ = get_tracer_tuple() + tracer, _, _ = get_tracer_tuple() # If we're not tracing, just return if not tracer: diff --git a/src/instana/instrumentation/tornado/client.py b/src/instana/instrumentation/tornado/client.py index bda0501a..5a1cc314 100644 --- a/src/instana/instrumentation/tornado/client.py +++ b/src/instana/instrumentation/tornado/client.py @@ -102,5 +102,3 @@ def finish_tracing(future: "Future", span: "InstanaSpan") -> None: logger.debug("Instrumenting tornado client") except ImportError: pass -except ImportError: - pass diff --git a/src/instana/instrumentation/urllib3.py b/src/instana/instrumentation/urllib3.py index 05a7a52a..9e30bdf0 100644 --- a/src/instana/instrumentation/urllib3.py +++ b/src/instana/instrumentation/urllib3.py @@ -91,7 +91,7 @@ def urlopen_with_instana( args: Tuple[int, str, Tuple[Any, ...]], kwargs: Dict[str, Any], ) -> urllib3.response.HTTPResponse: - tracer, parent_span, span_name = get_tracer_tuple() + tracer, _, span_name = get_tracer_tuple() # If we're not tracing, just return; boto3 has it's own visibility if not tracer or span_name == "boto3":