Skip to content

[OTel] Refactor of pymysql implementation #598

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
CagriYonca merged 2 commits into from
Sep 4, 2024
Merged

[OTel] Refactor of pymysql implementation #598

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
0fe3ae4
refactor(pymysql): added instrumentation of pymysql
CagriYonca Sep 3, 2024
609b3fb
unittests(pymysql): added refactor of unittests
CagriYonca Sep 3, 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
2 changes: 1 addition & 1 deletion src/instana/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def boot_agent():
pep0249, # noqa: F401
psycopg2, # noqa: F401
# pymongo, # noqa: F401
# pymysql, # noqa: F401
pymysql, # noqa: F401
# redis, # noqa: F401
# sqlalchemy, # noqa: F401
starlette_inst, # noqa: F401
Expand Down
14 changes: 7 additions & 7 deletions src/instana/instrumentation/pymysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
# (c) Copyright Instana Inc. 2019


from ..log import logger
from .pep0249 import ConnectionFactory
from instana.log import logger
from instana.instrumentation.pep0249 import ConnectionFactory

try:
import pymysql #
import pymysql

cf = ConnectionFactory(connect_func=pymysql.connect, module_name='mysql')
cf = ConnectionFactory(connect_func=pymysql.connect, module_name="mysql")

setattr(pymysql, 'connect', cf)
if hasattr(pymysql, 'Connect'):
setattr(pymysql, 'Connect', cf)
setattr(pymysql, "connect", cf)
if hasattr(pymysql, "Connect"):
setattr(pymysql, "Connect", cf)

logger.debug("Instrumenting pymysql")
except ImportError:
Expand Down
7 changes: 4 additions & 3 deletions src/instana/span/registered_span.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from instana.span.kind import ENTRY_SPANS, EXIT_SPANS, HTTP_SPANS, LOCAL_SPANS

from opentelemetry.trace import SpanKind
from opentelemetry.semconv.trace import SpanAttributes


class RegisteredSpan(BaseSpan):
Expand Down Expand Up @@ -237,9 +238,9 @@ def _populate_exit_span_data(self, span) -> None:
elif span.name == "mysql":
self.data["mysql"]["host"] = span.attributes.pop("host", None)
self.data["mysql"]["port"] = span.attributes.pop("port", None)
self.data["mysql"]["db"] = span.attributes.pop("db.name", None)
self.data["mysql"]["user"] = span.attributes.pop("db.user", None)
self.data["mysql"]["stmt"] = span.attributes.pop("db.statement", None)
self.data["mysql"]["db"] = span.attributes.pop(SpanAttributes.DB_NAME, None)
self.data["mysql"]["user"] = span.attributes.pop(SpanAttributes.DB_USER, None)
self.data["mysql"]["stmt"] = span.attributes.pop(SpanAttributes.DB_STATEMENT, None)
self.data["mysql"]["error"] = span.attributes.pop("mysql.error", None)

elif span.name == "postgres":
Expand Down
Loading