feat(asyncpg): replace db.statement.parameters with db.query.parameter.<key>

asyncpg has its own parameter capture implementation independent of dbapi.
Update it to use the shared `db_query_parameter_attributes` helper and
emit individual `db.query.parameter.<key>` attributes.

Update docker-based functional tests accordingly.

Author: Lotram

instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/__init__.py

@@ -59,7 +59,10 @@ async def main():
 from opentelemetry.instrumentation.asyncpg.package import _instruments
 from opentelemetry.instrumentation.asyncpg.version import __version__
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.instrumentation.utils import (
+    db_query_parameter_attributes,
+    unwrap,
+)
 from opentelemetry.semconv._incubating.attributes.db_attributes import (
     DB_NAME,
     DB_STATEMENT,
@@ -107,7 +110,7 @@ def _hydrate_span_from_args(connection, query, parameters) -> dict:
         span_attributes[DB_STATEMENT] = query
 
     if parameters is not None and len(parameters) > 0:
-        span_attributes["db.statement.parameters"] = str(parameters)
+        span_attributes.update(db_query_parameter_attributes(parameters))
 
     return span_attributes
 

tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py

@@ -12,6 +12,9 @@
 from opentelemetry.sdk.trace.export.in_memory_span_exporter import (
     InMemorySpanExporter,
 )
+from opentelemetry.semconv._incubating.attributes.db_attributes import (
+    DB_QUERY_PARAMETER_TEMPLATE,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
@@ -360,7 +363,7 @@ def test_instrumented_execute_method_with_arguments(self, *_, **__):
             spans[0].attributes[SpanAttributes.DB_STATEMENT], "SELECT $1;"
         )
         self.assertEqual(
-            spans[0].attributes["db.statement.parameters"], "('1',)"
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.0"], "'1'"
         )
 
     def test_instrumented_fetch_method_with_arguments(self, *_, **__):
@@ -375,7 +378,7 @@ def test_instrumented_fetch_method_with_arguments(self, *_, **__):
             spans[0].attributes[SpanAttributes.DB_STATEMENT], "SELECT $1;"
         )
         self.assertEqual(
-            spans[0].attributes["db.statement.parameters"], "('1',)"
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.0"], "'1'"
         )
 
     def test_instrumented_executemany_method_with_arguments(self, *_, **__):
@@ -389,7 +392,7 @@ def test_instrumented_executemany_method_with_arguments(self, *_, **__):
             spans[0].attributes[SpanAttributes.DB_STATEMENT], "SELECT $1;"
         )
         self.assertEqual(
-            spans[0].attributes["db.statement.parameters"], "([['1'], ['2']],)"
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.0"], "[['1'], ['2']]"
         )
 
     def test_instrumented_execute_interface_error_method(self, *_, **__):
@@ -404,7 +407,13 @@ def test_instrumented_execute_interface_error_method(self, *_, **__):
             spans[0].attributes[SpanAttributes.DB_STATEMENT], "SELECT 42;"
         )
         self.assertEqual(
-            spans[0].attributes["db.statement.parameters"], "(1, 2, 3)"
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.0"], "'1'"
+        )
+        self.assertEqual(
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.1"], "2"
+        )
+        self.assertEqual(
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.2"], "3"
         )
 
     def test_instrumented_executemany_method_empty_query(self, *_, **__):
@@ -417,7 +426,7 @@ def test_instrumented_executemany_method_empty_query(self, *_, **__):
         self.assertEqual(spans[0].name, POSTGRES_DB_NAME)
         self.assertEqual(spans[0].attributes[SpanAttributes.DB_STATEMENT], "")
         self.assertEqual(
-            spans[0].attributes["db.statement.parameters"], "([],)"
+            spans[0].attributes[f"{DB_QUERY_PARAMETER_TEMPLATE}.0"], "[]"
         )
 
     def test_instrumented_fetch_method_broken_asyncpg(self, *_, **__):
@@ -489,7 +498,7 @@ async def _fake_execute(*args, **kwargs):
                 SpanAttributes.NET_PEER_PORT: 5432,
                 SpanAttributes.NET_TRANSPORT: "ip_tcp",
                 SpanAttributes.DB_STATEMENT: "SELECT $1",
-                "db.statement.parameters": "('42',)",
+                f"{DB_QUERY_PARAMETER_TEMPLATE}.0": "'42'",
             },
         )
         self.assertEqual(span.kind, trace.SpanKind.CLIENT)
@@ -523,7 +532,7 @@ async def _fake_cursor_execute(*args, **kwargs):
                 SpanAttributes.NET_PEER_PORT: 5432,
                 SpanAttributes.NET_TRANSPORT: "ip_tcp",
                 SpanAttributes.DB_STATEMENT: "SELECT $1",
-                "db.statement.parameters": "('99',)",
+                f"{DB_QUERY_PARAMETER_TEMPLATE}.0": "'99'",
             },
         )
         self.assertEqual(span.kind, trace.SpanKind.CLIENT)