OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Don't actually one-line the SQL statements we send to the DB (#13129)

pull/13139/head
Brendan Abolivier 2022-06-30 10:43:24 +02:00 committed by GitHub
parent 13e359aec8
commit 4d3b8fb23f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13129.misc Normal file
View File

@ -0,0 +1 @@
Only one-line SQL statements for logging and tracing.

7
synapse/storage/database.py
View File

@ -366,10 +366,11 @@ class LoggingTransaction:
*args: P.args, *args: P.args,
**kwargs: P.kwargs, **kwargs: P.kwargs,
) -> R: ) -> R:
sql = self._make_sql_one_line(sql) # Generate a one-line version of the SQL to better log it.
one_line_sql = self._make_sql_one_line(sql)
# TODO(paul): Maybe use 'info' and 'debug' for values? # TODO(paul): Maybe use 'info' and 'debug' for values?
sql_logger.debug("[SQL] {%s} %s", self.name, sql) sql_logger.debug("[SQL] {%s} %s", self.name, one_line_sql)
sql = self.database_engine.convert_param_style(sql) sql = self.database_engine.convert_param_style(sql)
if args: if args:
@ -389,7 +390,7 @@ class LoggingTransaction:
"db.query", "db.query",
tags={ tags={
opentracing.tags.DATABASE_TYPE: "sql", opentracing.tags.DATABASE_TYPE: "sql",
opentracing.tags.DATABASE_STATEMENT: sql, opentracing.tags.DATABASE_STATEMENT: one_line_sql,
}, },
): ):
return func(sql, *args, **kwargs) return func(sql, *args, **kwargs)