From 7cf0517319527c750da8f7503c3d37e10af6837f Mon Sep 17 00:00:00 2001 From: Cagri Yonca Date: Wed, 7 May 2025 11:17:02 +0200 Subject: [PATCH] fix: Function type has been updated Signed-off-by: Cagri Yonca --- src/instana/instrumentation/aioamqp.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/instana/instrumentation/aioamqp.py b/src/instana/instrumentation/aioamqp.py index b7ca7e7a..7ef516b1 100644 --- a/src/instana/instrumentation/aioamqp.py +++ b/src/instana/instrumentation/aioamqp.py @@ -27,20 +27,21 @@ async def basic_publish_with_instana( ) as span: try: span.set_attribute("aioamqp.exchange", argv[0]) - return await wrapped(*argv, **kwargs) except Exception as exc: span.record_exception(exc) logger.debug(f"aioamqp basic_publish_with_instana error: {exc}") + finally: + return await wrapped(*argv, **kwargs) @wrapt.patch_function_wrapper("aioamqp.channel", "Channel.basic_consume") - def basic_consume_with_instana( + async def basic_consume_with_instana( wrapped: Callable[..., aioamqp.connect], instance: object, argv: Tuple[object, Tuple[object, ...]], kwargs: Dict[str, Any], ) -> object: if tracing_is_off(): - return wrapped(*argv, **kwargs) + return await wrapped(*argv, **kwargs) callback = argv[0] tracer, parent_span, _ = get_tracer_tuple() @@ -62,15 +63,16 @@ async def callback_wrapper( span.set_attribute("aioamqp.message", args[1]) span.set_attribute("aioamqp.exchange_name", args[2].exchange_name) span.set_attribute("aioamqp.routing_key", args[2].routing_key) - return await wrapped_callback(*args, **kwargs) except Exception as exc: span.record_exception(exc) logger.debug(f"aioamqp basic_consume_with_instana error: {exc}") + finally: + return await wrapped_callback(*args, **kwargs) wrapped_callback = callback_wrapper(callback) argv = (wrapped_callback,) + argv[1:] - return wrapped(*argv, **kwargs) + return await wrapped(*argv, **kwargs) logger.debug("Instrumenting aioamqp")