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

Add a test for mysql instrumentation using NoOpTracerProvider #1423

Merged
merged 14 commits into from
Dec 3, 2022
Merged

Add a test for mysql instrumentation using NoOpTracerProvider #1423

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f3e0ee2
add a test for mysql instrumentation using NoOpTracerProvider
avzis Oct 30, 2022
c29a15a
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
avzis Oct 30, 2022
6d5cd3b
update changelog
avzis Oct 30, 2022
d2dc5a3
rename function
avzis Oct 30, 2022
729d501
update import order
avzis Oct 30, 2022
035b36b
Merge branch 'main' into test-mysql-with-NoOpTracerProvider
avzis Nov 13, 2022
669ccf2
Merge branch 'main' into test-mysql-with-NoOpTracerProvider
srikanthccv Nov 15, 2022
85ad57b
Merge branch 'main' into test-mysql-with-NoOpTracerProvider
ocelotl Nov 21, 2022
9b3ae04
Merge branch 'test-mysql-with-NoOpTracerProvider' of github.com:avzis…
avzis Nov 24, 2022
7b7699c
refactor
avzis Nov 24, 2022
4fe7215
remove unused import
avzis Nov 24, 2022
598b2be
Merge branch 'main' into test-mysql-with-NoOpTracerProvider
srikanthccv Nov 28, 2022
20e9714
remove changelog update
avzis Nov 28, 2022
5023b2a
Merge branch 'main' into test-mysql-with-NoOpTracerProvider
avzis Dec 1, 2022
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
44 changes: 24 additions & 20 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 @@ -17,6 +17,7 @@
import mysql.connector

import opentelemetry.instrumentation.mysql
from opentelemetry import trace as trace_api
from opentelemetry.instrumentation.mysql import MySQLInstrumentor
from opentelemetry.sdk import resources
from opentelemetry.test.test_base import TestBase
Expand All @@ -31,6 +32,15 @@ def cursor(self):
return MockConnection()


def connect_and_execute_query():
cnx = mysql.connector.connect(database="test")
cursor = cnx.cursor()
query = "SELECT * FROM test"
cursor.execute(query)

return cnx, query


class TestMysqlIntegration(TestBase):
def tearDown(self):
super().tearDown()
Expand All @@ -42,10 +52,7 @@ def tearDown(self):
def test_instrumentor(self):
MySQLInstrumentor().instrument()

cnx = mysql.connector.connect(database="test")
cursor = cnx.cursor()
query = "SELECT * FROM test"
cursor.execute(query)
connect_and_execute_query()

spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 1)
Expand All @@ -59,10 +66,7 @@ def test_instrumentor(self):
# check that no spans are generated after uninstrumen
MySQLInstrumentor().uninstrument()

cnx = mysql.connector.connect(database="test")
cursor = cnx.cursor()
query = "SELECT * FROM test"
cursor.execute(query)
connect_and_execute_query()

spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 1)
Expand All @@ -74,10 +78,7 @@ def test_custom_tracer_provider(self):
tracer_provider, exporter = result

MySQLInstrumentor().instrument(tracer_provider=tracer_provider)
cnx = mysql.connector.connect(database="test")
cursor = cnx.cursor()
query = "SELECT * FROM test"
cursor.execute(query)
connect_and_execute_query()

span_list = exporter.get_finished_spans()
self.assertEqual(len(span_list), 1)
Expand All @@ -88,10 +89,7 @@ def test_custom_tracer_provider(self):
@patch("mysql.connector.connect", new=mock_connect)
# pylint: disable=unused-argument
def test_instrument_connection(self):
cnx = mysql.connector.connect(database="test")
query = "SELECT * FROM test"
cursor = cnx.cursor()
cursor.execute(query)
cnx, query = connect_and_execute_query()

spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 0)
Expand All @@ -103,14 +101,20 @@ def test_instrument_connection(self):
spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 1)

@patch("mysql.connector.connect", new=mock_connect)
def test_instrument_connection_no_op_tracer_provider(self):
tracer_provider = trace_api.NoOpTracerProvider()
MySQLInstrumentor().instrument(tracer_provider=tracer_provider)
connect_and_execute_query()

spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 0)

@patch("mysql.connector.connect", new=mock_connect)
# pylint: disable=unused-argument
def test_uninstrument_connection(self):
MySQLInstrumentor().instrument()
cnx = mysql.connector.connect(database="test")
query = "SELECT * FROM test"
cursor = cnx.cursor()
cursor.execute(query)
cnx, query = connect_and_execute_query()

spans_list = self.memory_exporter.get_finished_spans()
self.assertEqual(len(spans_list), 1)
Expand Down