Skip to content
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

Handle empty statement in psycopg instrumentation #2644

Merged
merged 6 commits into from
Jul 2, 2024
Merged

Handle empty statement in psycopg instrumentation #2644

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1ec928
Handle empty statement in psycopg instrumentation
Holi0317 Jun 28, 2024
a9babb3
Update changelog
Holi0317 Jun 28, 2024
2f00441
Move changelog entry
Holi0317 Jun 29, 2024
85b5014
Refactor empty string check
Holi0317 Jun 29, 2024
ec7cff1
Add test cases for empty query
Holi0317 Jun 30, 2024
76233d4
Merge branch 'main' into bugfix-2643
lzchen Jul 2, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#2612](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2612))
- `opentelemetry-instrumentation-system-metrics` Permit to use psutil 6.0+.
([#2630](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2630))
- `opentelemetry-instrumentation-psycopg` Bugfix: Handle empty statement. ([#2644](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2644))
xrmx marked this conversation as resolved.
Show resolved Hide resolved

### Added

Expand Down
3 changes: 2 additions & 1 deletion ...entelemetry-instrumentation-psycopg/src/opentelemetry/instrumentation/psycopg/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,8 @@ def get_operation_name(self, cursor, args):
if isinstance(statement, Composed):
statement = statement.as_string(cursor)

if isinstance(statement, str):
# `statement` can be empty string. See #2643
xrmx marked this conversation as resolved.
Show resolved Hide resolved
if isinstance(statement, str) and statement != "":
xrmx marked this conversation as resolved.
Show resolved Hide resolved
# Strip leading comments so we get the operation name.
return self._leading_comment_remover.sub("", statement).split()[0]

Expand Down