Skip to content

ref(mysql): remove SpanAttributes #3616

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
merged 3 commits into from
Jul 7, 2025
Merged

ref(mysql): remove SpanAttributes #3616

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f31cc0
ref(mysql): remove SpanAttributes
IAmPrajna Jul 5, 2025
4d093f5
fix imports
IAmPrajna Jul 5, 2025
87dbeb5
Merge branch 'main' into refactor-mysql
IAmPrajna Jul 5, 2025
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
20 changes: 11 additions & 9 deletions instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
from opentelemetry import trace as trace_api
from opentelemetry.instrumentation.mysql import MySQLInstrumentor
from opentelemetry.sdk import resources
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.semconv._incubating.attributes.db_attributes import (
DB_STATEMENT,
)
from opentelemetry.test.test_base import TestBase


Expand Down Expand Up @@ -157,7 +159,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled(self):
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down Expand Up @@ -196,7 +198,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_stmt_enabled(
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)

Expand Down Expand Up @@ -239,7 +241,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_with_options(
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_threadsafety='123',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down Expand Up @@ -274,7 +276,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_not_enabled_default(
spans_list = self.memory_exporter.get_finished_spans()
span = spans_list[0]
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down Expand Up @@ -332,7 +334,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled(
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down Expand Up @@ -373,7 +375,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_stmt_enabled(
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)

Expand Down Expand Up @@ -418,7 +420,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_with_options(
f"Select 1 /*db_driver='mysql.connector%%3Afoobar',dbapi_threadsafety='123',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
)
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down Expand Up @@ -453,7 +455,7 @@ def test_instrument_with_dbapi_sqlcomment_not_enabled_default(
spans_list = self.memory_exporter.get_finished_spans()
span = spans_list[0]
self.assertEqual(
span.attributes[SpanAttributes.DB_STATEMENT],
span.attributes[DB_STATEMENT],
"Select 1;",
)

Expand Down
Loading