Skip to content

Remove duplicate query logging that breaks Django's assertNumQueries #4367

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

Open
federicobond wants to merge 2 commits into
base: main
Choose a base branch
from
+2 −11
Open

Remove duplicate query logging that breaks Django's assertNumQueries #4367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b94cb1
Remove duplicate query logging that breaks Django's assertNumQueries
federicobond Mar 27, 2026
b9af128
Remove outdated comment about MySQL
federicobond Mar 28, 2026
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- `opentelemetry-instrumentation-django`: Remove duplicate query logging in SQLCommenter middleware that broke Django's `assertNumQueries`
([#4367](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4367))
- `opentelemetry-docker-tests`: Replace deprecated `SpanAttributes` from `opentelemetry.semconv.trace` with `opentelemetry.semconv._incubating.attributes`
([#4339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4339))
- `opentelemetry-instrumentation-confluent-kafka`: Skip `recv` span creation when `poll()` returns no message or `consume()` returns an empty list, avoiding empty spans on idle polls
Expand Down
11 changes: 0 additions & 11 deletions ...ion-django/src/opentelemetry/instrumentation/django/middleware/sqlcommenter_middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# pylint: disable=no-name-in-module
from django import conf, get_version
from django.db import connections
from django.db.backends.utils import CursorDebugWrapper

from opentelemetry.instrumentation.sqlcommenter_utils import _add_sql_comment
from opentelemetry.instrumentation.utils import _get_opentelemetry_values
Expand Down Expand Up @@ -116,14 +115,4 @@ def __call__(self, execute: Type[T], sql, params, many, context) -> T:
**_get_opentelemetry_values() if with_opentelemetry else {},
)

# TODO: MySQL truncates logs > 1024B so prepend comments
# instead of statements, if the engine is MySQL.
# See:
# * https://github.com/basecamp/marginalia/issues/61
# * https://github.com/basecamp/marginalia/pull/80

# Add the query to the query log if debugging.
if isinstance(context["cursor"], CursorDebugWrapper):
context["connection"].queries_log.append(sql)

return execute(sql, params, many, context)
Loading