diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py b/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py index f32ef3514b..b02dac3afb 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py +++ b/instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py @@ -28,7 +28,16 @@ _PoolAcquireContextManager, ) from opentelemetry.sdk import resources -from opentelemetry.semconv.trace import SpanAttributes +from opentelemetry.semconv._incubating.attributes.db_attributes import ( + DB_NAME, + DB_STATEMENT, + DB_SYSTEM, + DB_USER, +) +from opentelemetry.semconv._incubating.attributes.net_attributes import ( + NET_PEER_NAME, + NET_PEER_PORT, +) from opentelemetry.test.test_base import TestBase @@ -317,24 +326,16 @@ def test_span_succeeded(self): self.assertEqual(span.name, "Test") self.assertIs(span.kind, trace_api.SpanKind.CLIENT) - self.assertEqual( - span.attributes[SpanAttributes.DB_SYSTEM], "testcomponent" - ) - self.assertEqual( - span.attributes[SpanAttributes.DB_NAME], "testdatabase" - ) - self.assertEqual( - span.attributes[SpanAttributes.DB_STATEMENT], "Test query" - ) + self.assertEqual(span.attributes[DB_SYSTEM], "testcomponent") + self.assertEqual(span.attributes[DB_NAME], "testdatabase") + self.assertEqual(span.attributes[DB_STATEMENT], "Test query") self.assertEqual( span.attributes["db.statement.parameters"], "('param1Value', False)", ) - self.assertEqual(span.attributes[SpanAttributes.DB_USER], "testuser") - self.assertEqual( - span.attributes[SpanAttributes.NET_PEER_NAME], "testhost" - ) - self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 123) + self.assertEqual(span.attributes[DB_USER], "testuser") + self.assertEqual(span.attributes[NET_PEER_NAME], "testhost") + self.assertEqual(span.attributes[NET_PEER_PORT], 123) self.assertIs(span.status.status_code, trace_api.StatusCode.UNSET) def test_span_not_recording(self): @@ -381,9 +382,7 @@ def test_span_failed(self): spans_list = self.memory_exporter.get_finished_spans() self.assertEqual(len(spans_list), 1) span = spans_list[0] - self.assertEqual( - span.attributes[SpanAttributes.DB_STATEMENT], "Test query" - ) + self.assertEqual(span.attributes[DB_STATEMENT], "Test query") self.assertIs(span.status.status_code, trace_api.StatusCode.ERROR) self.assertEqual( span.status.description, "ProgrammingError: Test Exception" @@ -400,9 +399,7 @@ def test_executemany(self): self.assertEqual(len(spans_list), 1) span = spans_list[0] - self.assertEqual( - span.attributes[SpanAttributes.DB_STATEMENT], "Test query" - ) + self.assertEqual(span.attributes[DB_STATEMENT], "Test query") def test_callproc(self): db_integration = AiopgIntegration(self.tracer, "testcomponent") @@ -416,7 +413,7 @@ def test_callproc(self): self.assertEqual(len(spans_list), 1) span = spans_list[0] self.assertEqual( - span.attributes[SpanAttributes.DB_STATEMENT], + span.attributes[DB_STATEMENT], "Test stored procedure", )