From fb8b83b4deeab0aa264b8d6241723f6c74a0b305 Mon Sep 17 00:00:00 2001 From: Ivana Kellyerova Date: Wed, 13 Dec 2023 15:52:54 +0100 Subject: [PATCH 1/2] fix(django): Fix psycopg2 detection --- sentry_sdk/integrations/django/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py index bfca1e674a..51806e9966 100644 --- a/sentry_sdk/integrations/django/__init__.py +++ b/sentry_sdk/integrations/django/__init__.py @@ -697,7 +697,7 @@ def _set_db_data(span, cursor_or_db): is_psycopg2 = ( hasattr(cursor_or_db, "connection") and hasattr(cursor_or_db.connection, "get_dsn_parameters") - and inspect.isfunction(cursor_or_db.connection.get_dsn_parameters) + and inspect.isroutine(cursor_or_db.connection.get_dsn_parameters) ) if is_psycopg2: connection_params = cursor_or_db.connection.get_dsn_parameters() From 9cabf83f92b5fe7fb5dd7c9aed12b7491703a541 Mon Sep 17 00:00:00 2001 From: Ivana Kellyerova Date: Wed, 13 Dec 2023 15:56:42 +0100 Subject: [PATCH 2/2] also use isroutine later on --- sentry_sdk/integrations/django/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry_sdk/integrations/django/__init__.py b/sentry_sdk/integrations/django/__init__.py index 51806e9966..426565e645 100644 --- a/sentry_sdk/integrations/django/__init__.py +++ b/sentry_sdk/integrations/django/__init__.py @@ -706,7 +706,7 @@ def _set_db_data(span, cursor_or_db): hasattr(cursor_or_db, "connection") and hasattr(cursor_or_db.connection, "info") and hasattr(cursor_or_db.connection.info, "get_parameters") - and inspect.isfunction(cursor_or_db.connection.info.get_parameters) + and inspect.isroutine(cursor_or_db.connection.info.get_parameters) ) if is_psycopg3: connection_params = cursor_or_db.connection.info.get_parameters()