diff --git a/CHANGELOG.md b/CHANGELOG.md index b5339972d..173abf88f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3027](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3027)) - `opentelemetry-instrumentation-mysqlclient` Add sqlcommenter support ([#2941](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2941)) +- `opentelemetry-instrumentation-pymysql` Add sqlcommenter support + ([#2942](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2942)) ### Fixed @@ -34,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#3025](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3025)) - `opentelemetry-instrumentation-httpx`: Check if mount transport is none before wrap it ([#3022](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3022)) +- Replace all instrumentor unit test `assertEqualSpanInstrumentationInfo` calls with `assertEqualSpanInstrumentationScope` calls + ([#3037](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3037)) ### Breaking changes @@ -58,8 +62,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#2635](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2635)) - `opentelemetry-instrumentation` Add support for string based dotted module paths in unwrap ([#2919](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2919)) -- `opentelemetry-instrumentation-pymysql` Add sqlcommenter support - ([#2942](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2942)) ### Fixed diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py b/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py index c497ae456..f32ef3514 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py +++ b/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py @@ -67,7 +67,7 @@ class TestAiopgInstrumentor(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.aiopg ) @@ -96,7 +96,7 @@ class TestAiopgInstrumentor(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.aiopg ) @@ -117,7 +117,7 @@ class TestAiopgInstrumentor(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.aiopg ) @@ -148,7 +148,7 @@ class TestAiopgInstrumentor(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.aiopg ) diff --git a/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py b/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py index ed488ab07..9a36bb906 100644 --- a/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py +++ b/instrumentation/opentelemetry-instrumentation-cassandra/tests/test_cassandra_integration.py @@ -78,7 +78,7 @@ class TestCassandraIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.cassandra ) self.assertEqual(span.name, "Cassandra") diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py index b7e24d87c..8a707c8c2 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py @@ -114,7 +114,7 @@ class TestElasticsearchIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.elasticsearch ) @@ -608,7 +608,7 @@ class TestElasticsearchIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.elasticsearch ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor.py index 7ae164914..4cd19da4a 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_client_interceptor.py @@ -114,7 +114,7 @@ class TestAioClientInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -142,7 +142,7 @@ class TestAioClientInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -170,7 +170,7 @@ class TestAioClientInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -200,7 +200,7 @@ class TestAioClientInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py index 050f6f8d1..ee917ca26 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_aio_server_interceptor.py @@ -105,7 +105,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -164,7 +164,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -217,7 +217,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(parent_span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( parent_span, opentelemetry.instrumentation.grpc ) @@ -263,7 +263,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -318,7 +318,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(parent_span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( parent_span, opentelemetry.instrumentation.grpc ) @@ -514,7 +514,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -579,7 +579,7 @@ class TestOpenTelemetryAioServerInterceptor(TestBase, IsolatedAsyncioTestCase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py index 38759352b..9fb922a61 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor.py @@ -111,7 +111,7 @@ class TestClientProto(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -125,7 +125,7 @@ class TestClientProto(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -151,7 +151,7 @@ class TestClientProto(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -177,7 +177,7 @@ class TestClientProto(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -205,7 +205,7 @@ class TestClientProto(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py index b6ae975df..81e8d708f 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_client_interceptor_filter.py @@ -116,7 +116,7 @@ class TestClientProtoFilterMethodName(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -130,7 +130,7 @@ class TestClientProtoFilterMethodName(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -260,7 +260,7 @@ class TestClientProtoFilterMethodPrefix(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -274,7 +274,7 @@ class TestClientProtoFilterMethodPrefix(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -443,7 +443,7 @@ class TestClientProtoFilterByEnvAndOption(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -457,7 +457,7 @@ class TestClientProtoFilterByEnvAndOption(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -483,7 +483,7 @@ class TestClientProtoFilterByEnvAndOption(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -509,7 +509,7 @@ class TestClientProtoFilterByEnvAndOption(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -537,7 +537,7 @@ class TestClientProtoFilterByEnvAndOption(TestBase): self.assertIs(span.kind, trace.SpanKind.CLIENT) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py index de7926989..08aa16187 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor.py @@ -120,7 +120,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -188,7 +188,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -252,7 +252,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(parent_span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( parent_span, opentelemetry.instrumentation.grpc ) @@ -307,7 +307,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -371,7 +371,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(parent_span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( parent_span, opentelemetry.instrumentation.grpc ) @@ -594,7 +594,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -626,7 +626,7 @@ class TestOpenTelemetryServerInterceptor(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor_filter.py b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor_filter.py index 95e70236c..6a0081c4a 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor_filter.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/tests/test_server_interceptor_filter.py @@ -109,7 +109,7 @@ class TestOpenTelemetryServerInterceptorFilterMethodName(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) @@ -195,7 +195,7 @@ class TestOpenTelemetryServerInterceptorFilterMethodName(TestBase): self.assertIs(span.kind, trace.SpanKind.SERVER) # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.grpc ) diff --git a/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py b/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py index 0fdab381d..148fe2789 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py +++ b/instrumentation/opentelemetry-instrumentation-httpx/tests/test_httpx_integration.py @@ -216,7 +216,7 @@ class BaseTestCases: self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.httpx ) @@ -240,7 +240,7 @@ class BaseTestCases: self.assertIs(span.status.status_code, trace.StatusCode.ERROR) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.httpx ) @@ -269,7 +269,7 @@ class BaseTestCases: self.assertIs(span.status.status_code, trace.StatusCode.ERROR) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.httpx ) @@ -309,7 +309,7 @@ class BaseTestCases: self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.httpx ) @@ -350,7 +350,7 @@ class BaseTestCases: self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.httpx ) diff --git a/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py b/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py index 3614febff..79399cce7 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py +++ b/instrumentation/opentelemetry-instrumentation-mysql/tests/test_mysql_integration.py @@ -50,7 +50,7 @@ class TestMysqlIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.mysql ) diff --git a/instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py b/instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py index 5c375ac4a..ae221f68f 100644 --- a/instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py +++ b/instrumentation/opentelemetry-instrumentation-mysqlclient/tests/test_mysqlclient_integration.py @@ -44,7 +44,7 @@ class TestMySQLClientIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.mysqlclient ) diff --git a/instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py b/instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py index dc9969ba8..4ddaad917 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py +++ b/instrumentation/opentelemetry-instrumentation-psycopg/tests/test_psycopg_integration.py @@ -182,7 +182,7 @@ class TestPostgresqlIntegration(PostgresqlIntegrationTestMixin, TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.psycopg ) @@ -213,7 +213,7 @@ class TestPostgresqlIntegration(PostgresqlIntegrationTestMixin, TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.psycopg ) @@ -407,7 +407,7 @@ class TestPostgresqlIntegrationAsync( span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.psycopg ) @@ -435,7 +435,7 @@ class TestPostgresqlIntegrationAsync( span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.psycopg ) diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py index 667107304..9a6a5ff2f 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/tests/test_psycopg2_integration.py @@ -100,7 +100,7 @@ class TestPostgresqlIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.psycopg2 ) diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py b/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py index 3ba5ee235..82294236f 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py +++ b/instrumentation/opentelemetry-instrumentation-pymysql/tests/test_pymysql_integration.py @@ -45,7 +45,7 @@ class TestPyMysqlIntegration(TestBase): span = spans_list[0] # Check version and name in span's instrumentation info - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.pymysql ) diff --git a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py index a5cb8927a..366cd0c23 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py +++ b/instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py @@ -166,7 +166,7 @@ class RequestsIntegrationTestBase(abc.ABC): self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.requests ) diff --git a/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py b/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py index 8ac028493..b085cc50d 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py +++ b/instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py @@ -158,7 +158,7 @@ class URLLibIntegrationTestBase(abc.ABC): self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.urllib ) @@ -182,7 +182,7 @@ class URLLibIntegrationTestBase(abc.ABC): self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.urllib ) @@ -209,7 +209,7 @@ class URLLibIntegrationTestBase(abc.ABC): self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.urllib ) @@ -344,7 +344,7 @@ class URLLibIntegrationTestBase(abc.ABC): self.assertIs(span.status.status_code, trace.StatusCode.UNSET) - self.assertEqualSpanInstrumentationInfo( + self.assertEqualSpanInstrumentationScope( span, opentelemetry.instrumentation.urllib )