Merge branch 'main' into barebones

Author: nagkumar91

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",
         )
 

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

@@ -20,10 +20,18 @@
 
 from typing import TYPE_CHECKING, Any
 
+from opentelemetry.semconv._incubating.attributes.db_attributes import (
+    DB_REDIS_DATABASE_INDEX,
+    DB_SYSTEM,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
+    NET_PEER_NAME,
+    NET_PEER_PORT,
+    NET_TRANSPORT,
+)
 from opentelemetry.semconv.trace import (
     DbSystemValues,
     NetTransportValues,
-    SpanAttributes,
 )
 from opentelemetry.trace import Span
 
@@ -41,25 +49,17 @@
 def _extract_conn_attributes(conn_kwargs):
     """Transform redis conn info into dict"""
     attributes = {
-        SpanAttributes.DB_SYSTEM: DbSystemValues.REDIS.value,
+        DB_SYSTEM: DbSystemValues.REDIS.value,
     }
     db = conn_kwargs.get("db", 0)
-    attributes[SpanAttributes.DB_REDIS_DATABASE_INDEX] = db
+    attributes[DB_REDIS_DATABASE_INDEX] = db
     if "path" in conn_kwargs:
-        attributes[SpanAttributes.NET_PEER_NAME] = conn_kwargs.get("path", "")
-        attributes[SpanAttributes.NET_TRANSPORT] = (
-            NetTransportValues.OTHER.value
-        )
+        attributes[NET_PEER_NAME] = conn_kwargs.get("path", "")
+        attributes[NET_TRANSPORT] = NetTransportValues.OTHER.value
     else:
-        attributes[SpanAttributes.NET_PEER_NAME] = conn_kwargs.get(
-            "host", "localhost"
-        )
-        attributes[SpanAttributes.NET_PEER_PORT] = conn_kwargs.get(
-            "port", 6379
-        )
-        attributes[SpanAttributes.NET_TRANSPORT] = (
-            NetTransportValues.IP_TCP.value
-        )
+        attributes[NET_PEER_NAME] = conn_kwargs.get("host", "localhost")
+        attributes[NET_PEER_PORT] = conn_kwargs.get("port", 6379)
+        attributes[NET_TRANSPORT] = NetTransportValues.IP_TCP.value
 
     return attributes