Skip to content

Replace SpanAttributes with opentelemetry.semconv._incubating.attributes #3810

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 2 commits into from
Oct 6, 2025
+19 −22
Merged

Replace SpanAttributes with opentelemetry.semconv._incubating.attributes #3810

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29937a6
Replace SpanAttributes with opentelemetry.semconv._incubating.attributes
beshbeeshy Oct 6, 2025
cad29e9
Merge branch 'main' into aiopg-spanattributes
xrmx Oct 6, 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
41 changes: 19 additions & 22 deletions instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down Expand Up @@ -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):
Expand Down Expand Up @@ -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"
Expand All @@ -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")
Expand All @@ -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",
)

Expand Down