Skip to content

Commit f5adb4d

Browse files
authored
opentelemetry-instrumentation-mysqlclient: update unit tests to properly validate trace context trace flags values (#4560)
* opentelemetry-instrumentation-mysqlclient: update unit tests to properly validate trace context trace flags values * update CHANGELOG.md
1 parent 23ac232 commit f5adb4d

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5656
([#4368](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4368))
5757
- `opentelemetry-instrumentation-celery`: Coerce timelimit values to strings in `set_attributes_from_context()` to prevent mixed-type span attribute warning
5858
([#4361](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4361))
59+
- `opentelemetry-instrumentation-mysqlclient`: Update unit tests to properly validate trace context trace flag values.
60+
([#4560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4560))
5961

6062
### Breaking changes
6163

instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled(self):
143143
span = spans_list[0]
144144
span_id = format(span.get_span_context().span_id, "016x")
145145
trace_id = format(span.get_span_context().trace_id, "032x")
146+
trace_flags = format(span.get_span_context().trace_flags, "02x")
146147
self.assertEqual(
147148
mock_cursor.execute.call_args[0][0],
148-
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
149+
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
149150
)
150151
self.assertEqual(
151152
span.attributes[DB_STATEMENT],
@@ -194,7 +195,7 @@ def test_instrument_connection_with_dbapi_sqlcomment_enabled_stmt_enabled(
194195
)
195196
self.assertEqual(
196197
span.attributes[DB_STATEMENT],
197-
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
198+
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
198199
)
199200

200201
def test_instrument_connection_with_dbapi_sqlcomment_enabled_with_options(
@@ -391,7 +392,7 @@ def test_instrument_with_dbapi_sqlcomment_enabled_stmt_enabled(
391392
)
392393
self.assertEqual(
393394
span.attributes[DB_STATEMENT],
394-
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-01'*/;",
395+
f"Select 1 /*db_driver='MySQLdb%%3Afoobar',dbapi_level='123',dbapi_threadsafety='123',driver_paramstyle='test',mysql_client_version='foobaz',traceparent='00-{trace_id}-{span_id}-{trace_flags}'*/;",
395396
)
396397

397398
def test_instrument_with_dbapi_sqlcomment_enabled_with_options(

0 commit comments

Comments
 (0)