Fix psycopg2 instrument_connection AttributeError#3043
Closed
tammy-baylis-swi wants to merge 31 commits intoopen-telemetry:mainfrom
Closed
Fix psycopg2 instrument_connection AttributeError#3043tammy-baylis-swi wants to merge 31 commits intoopen-telemetry:mainfrom
tammy-baylis-swi wants to merge 31 commits intoopen-telemetry:mainfrom
Conversation
tammy-baylis-swi
changed the title
tammy-baylis-swi
force-pushed
the
fix-psycopg2-instrument-connection
branch
from
354d085 to
7871734
Compare
tammy-baylis-swi
changed the title
tammy-baylis-swi
force-pushed
the
fix-psycopg2-instrument-connection
branch
from
7871734 to
fa46143
Compare
tammy-baylis-swi
force-pushed
the
fix-psycopg2-instrument-connection
branch
from
fa46143 to
a0c9940
Compare
tammy-baylis-swi
commented
Dec 5, 2024
instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py
Show resolved
Hide resolved
tammy-baylis-swi
force-pushed
the
fix-psycopg2-instrument-connection
branch
from
5bd1e94 to
b591b0a
Compare
xrmx
reviewed
Dec 6, 2024
instrumentation/opentelemetry-instrumentation-psycopg2/README.rst
Outdated
Show resolved
Hide resolved
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
lzchen
reviewed
Dec 20, 2024
...pentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py
Outdated
Show resolved
Hide resolved
lzchen
reviewed
Dec 20, 2024
...pentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/__init__.py
Show resolved
Hide resolved
lzchen
reviewed
Jan 10, 2025
|
|
||
| # Save cursor_factory in instrumentor map because | ||
| # psycopg2 connection type does not allow arbitrary attrs | ||
| self._otel_cursor_factories[connection] = connection.cursor_factory |
Contributor
There was a problem hiding this comment.
We don't use the set of cursor factories for anything? Don't we need to check if the factory is in the set already or is that part of the TODO? I'd rather have the whole duplicate functionality there or you can leave it for a different PR but remove the set for now since it doesn't seem to be doing anything.
tammy-baylis-swi
force-pushed
the
fix-psycopg2-instrument-connection
branch
from
0a1360d to
680b0f5
Compare
xrmx
approved these changes
Feb 28, 2025
Contributor
xrmx
left a comment
xrmx
left a comment
There was a problem hiding this comment.
I find the name of the tests very confusing but yeah, better double spans than a crash I guess
Contributor
Author
|
@xrmx I've resolved merge conflicts and updated changelog for this one. Anything else? |
Contributor
Author
|
We've got a big release coming up 😺 Will this change be included? |
herin049
approved these changes
Feb 19, 2026
|
|
||
| # TODO(owais): check if core dbapi can do this for all dbapi implementations e.g, pymysql and mysql | ||
| @staticmethod | ||
| def uninstrument_connection(connection): |
Member
There was a problem hiding this comment.
I'm not sure we should leave this as a no-op.
If we used a class-level store (eg WeakKeyDictionary), we could track the factories using connection ID and then uninstrument_connection could work.
What do you think @tammy-baylis-swi?
11 tasks
Contributor
Author
|
Closing this in favour of #4257 |
github-project-automation
bot
moved this from Ready for review
to Done
in Python PR digest
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Removes the attempt to set attribute
connection._is_instrumented_by_opentelemetrybecausepsycopg2.extensions.connectiondoes not allow setting of extra attributes and we getAttributeError. SimilarAttributeErroralso happened with setattr forconnection._otel_orig_cursor_factoryso also removed.Adds todos to re-add checks for connection-already-being-instrumented later, as discussed:
Fixes #2522
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
tox -e py312-test-instrumentation-psycopg2Psycopg2Instrumentor.instrument_connectionPsycopg2Instrumentor.instrumentDoes This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.