refactor: reuse Redis semconv attributes for Valkey until official definitions exist

Use DB_REDIS_DATABASE_INDEX, db.redis.args_length, and db.redis.pipeline_length
instead of bespoke db.valkey.* attributes. db.system remains "valkey" to identify
the actual database product. Per review feedback from MikeGoldsmith.

Author: sightseeker

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

@@ -163,7 +163,10 @@ def response_hook(span, instance, response):
 from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.instrumentation.valkey.package import _instruments
 from opentelemetry.instrumentation.valkey.version import __version__
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv._incubating.attributes.db_attributes import (
+    DB_REDIS_DATABASE_INDEX,
+    DB_SYSTEM,
+)
 from opentelemetry.trace import TracerProvider, get_tracer
 
 if TYPE_CHECKING:
@@ -181,10 +184,10 @@ def response_hook(span, instance, response):
 _VALKEY_CONFIG = KVStoreConfig(
     backend_name="valkey",
     db_system="valkey",
-    db_system_attr=SpanAttributes.DB_SYSTEM,
-    db_index_attr="db.valkey.database_index",
-    args_length_attr="db.valkey.args_length",
-    pipeline_length_attr="db.valkey.pipeline_length",
+    db_system_attr=DB_SYSTEM,
+    db_index_attr=DB_REDIS_DATABASE_INDEX,
+    args_length_attr="db.redis.args_length",
+    pipeline_length_attr="db.redis.pipeline_length",
     watch_error_class=valkey.WatchError,
 )
 

instrumentation/opentelemetry-instrumentation-valkey/src/opentelemetry/instrumentation/valkey/util.py

@@ -32,12 +32,15 @@
     _set_span_attribute_if_value,
     _value_or_none,
 )
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv._incubating.attributes.db_attributes import (
+    DB_REDIS_DATABASE_INDEX,
+    DB_SYSTEM,
+)
 
 _BACKEND_NAME = "valkey"
 _DB_SYSTEM = "valkey"
-_DB_SYSTEM_ATTR = SpanAttributes.DB_SYSTEM
-_DB_INDEX_ATTR = "db.valkey.database_index"
+_DB_SYSTEM_ATTR = DB_SYSTEM
+_DB_INDEX_ATTR = DB_REDIS_DATABASE_INDEX
 
 __all__ = [
     "_extract_conn_attributes",

instrumentation/opentelemetry-instrumentation-valkey/tests/test_valkey.py

@@ -245,7 +245,7 @@ def test_attributes_default(self):
             span.attributes[SpanAttributes.DB_SYSTEM],
             "valkey",
         )
-        self.assertEqual(span.attributes["db.valkey.database_index"], 0)
+        self.assertEqual(span.attributes["db.redis.database_index"], 0)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "localhost"
         )
@@ -271,7 +271,7 @@ def test_attributes_tcp(self):
             span.attributes[SpanAttributes.DB_SYSTEM],
             "valkey",
         )
-        self.assertEqual(span.attributes["db.valkey.database_index"], 1)
+        self.assertEqual(span.attributes["db.redis.database_index"], 1)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME], "1.1.1.1"
         )
@@ -297,7 +297,7 @@ def test_attributes_unix_socket(self):
             span.attributes[SpanAttributes.DB_SYSTEM],
             "valkey",
         )
-        self.assertEqual(span.attributes["db.valkey.database_index"], 3)
+        self.assertEqual(span.attributes["db.redis.database_index"], 3)
         self.assertEqual(
             span.attributes[SpanAttributes.NET_PEER_NAME],
             "/path/to/socket.sock",