Skip to content

In Postgres take the connection params from the connection #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 17, 2023
Merged

In Postgres take the connection params from the connection #2308

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
945e3c8
In Postgres take the connection params from the connection and not th…
antonpirker Aug 16, 2023
9a74eeb
Fixed test
antonpirker Aug 16, 2023
506f974
Make port always string to be consistent
antonpirker Aug 17, 2023
39c4619
Merge branch 'master' into antonpirker/2303-connections-params-perfor…
antonpirker Aug 17, 2023
598f067
Refactoring
antonpirker Aug 17, 2023
c2d8453
Merge branch 'antonpirker/2303-connections-params-performance' of git…
antonpirker Aug 17, 2023
dbe8a4d
do not run in parallel for better debugging
antonpirker Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions sentry_sdk/integrations/django/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import weakref
from importlib import import_module

from sentry_sdk._compat import string_types
from sentry_sdk._compat import string_types, text_type
from sentry_sdk._types import TYPE_CHECKING
from sentry_sdk.consts import OP, SPANDATA
from sentry_sdk.hub import Hub, _should_send_default_pii
Expand Down Expand Up @@ -612,7 +612,7 @@ def execute(self, sql, params=None):
with record_sql_queries(
hub, self.cursor, sql, params, paramstyle="format", executemany=False
) as span:
_set_db_data(span, self.db.vendor, self.db.get_connection_params())
_set_db_data(span, self)
return real_execute(self, sql, params)

def executemany(self, sql, param_list):
Expand All @@ -624,7 +624,7 @@ def executemany(self, sql, param_list):
with record_sql_queries(
hub, self.cursor, sql, param_list, paramstyle="format", executemany=True
) as span:
_set_db_data(span, self.db.vendor, self.db.get_connection_params())
_set_db_data(span, self)
return real_executemany(self, sql, param_list)

def connect(self):
Expand All @@ -637,7 +637,7 @@ def connect(self):
hub.add_breadcrumb(message="connect", category="query")

with hub.start_span(op=OP.DB, description="connect") as span:
_set_db_data(span, self.vendor, self.get_connection_params())
_set_db_data(span, self)
return real_connect(self)

CursorWrapper.execute = execute
Expand All @@ -646,10 +646,19 @@ def connect(self):
ignore_logger("django.db.backends")


def _set_db_data(span, vendor, connection_params):
# type: (Span, str, Dict[str, str]) -> None
def _set_db_data(span, cursor_or_db):
# type: (Span, Any) -> None

db = cursor_or_db.db if hasattr(cursor_or_db, "db") else cursor_or_db
vendor = db.vendor
span.set_data(SPANDATA.DB_SYSTEM, vendor)

connection_params = (
cursor_or_db.connection.get_dsn_parameters()
if hasattr(cursor_or_db, "connection")
and hasattr(cursor_or_db.connection, "get_dsn_parameters")
else db.get_connection_params()
)
db_name = connection_params.get("dbname") or connection_params.get("database")
if db_name is not None:
span.set_data(SPANDATA.DB_NAME, db_name)
Expand All @@ -660,7 +669,7 @@ def _set_db_data(span, vendor, connection_params):

server_port = connection_params.get("port")
if server_port is not None:
span.set_data(SPANDATA.SERVER_PORT, server_port)
span.set_data(SPANDATA.SERVER_PORT, text_type(server_port))

server_socket_address = connection_params.get("unix_socket")
if server_socket_address is not None:
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/django/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ def test_db_connection_span_data(sentry_init, client, capture_events):
assert data.get(SPANDATA.SERVER_ADDRESS) == os.environ.get(
"SENTRY_PYTHON_TEST_POSTGRES_HOST", "localhost"
)
assert data.get(SPANDATA.SERVER_PORT) == 5432
assert data.get(SPANDATA.SERVER_PORT) == "5432"


@pytest.mark.parametrize(
Expand Down