get rid of conversation kind which is deprecated and fix some more imports

Author: weslayer

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

@@ -44,16 +44,16 @@
 )
 from opentelemetry.propagators.textmap import CarrierT, Getter, Setter
 from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
-    MESSAGING_CONVERSATION_ID,
-    MESSAGING_DESTINATION,
-    MESSAGING_DESTINATION_KIND,
+    MESSAGING_DESTINATION_NAME,
+    MESSAGING_MESSAGE_CONVERSATION_ID,
     MESSAGING_MESSAGE_ID,
     MESSAGING_OPERATION,
     MESSAGING_SYSTEM,
-    MESSAGING_URL,
+)
+from opentelemetry.semconv._incubating.attributes.server_attributes import (
+    SERVER_ADDRESS,
 )
 from opentelemetry.semconv.trace import (
-    MessagingDestinationKindValues,
     MessagingOperationValues,
 )
 from opentelemetry.trace import Link, Span, SpanKind, Tracer, TracerProvider
@@ -160,17 +160,15 @@ def _enrich_span(
         if not span.is_recording():
             return
         span.set_attribute(MESSAGING_SYSTEM, "aws.sqs")
-        span.set_attribute(MESSAGING_DESTINATION, queue_name)
-        span.set_attribute(
-            MESSAGING_DESTINATION_KIND,
-            MessagingDestinationKindValues.QUEUE.value,
-        )
-        span.set_attribute(MESSAGING_URL, queue_url)
+        span.set_attribute(MESSAGING_DESTINATION_NAME, queue_name)
+        span.set_attribute(SERVER_ADDRESS, queue_url)
 
         if operation:
             span.set_attribute(MESSAGING_OPERATION, operation.value)
         if conversation_id:
-            span.set_attribute(MESSAGING_CONVERSATION_ID, conversation_id)
+            span.set_attribute(
+                MESSAGING_MESSAGE_CONVERSATION_ID, conversation_id
+            )
         if message_id:
             span.set_attribute(MESSAGING_MESSAGE_ID, message_id)
 

instrumentation/opentelemetry-instrumentation-boto3sqs/tests/test_boto3sqs_instrumentation.py

@@ -28,17 +28,15 @@
     Boto3SQSSetter,
 )
 from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
-    MESSAGING_DESTINATION,
-    MESSAGING_DESTINATION_KIND,
+    MESSAGING_DESTINATION_NAME,
     MESSAGING_MESSAGE_ID,
     MESSAGING_OPERATION,
     MESSAGING_SYSTEM,
-    MESSAGING_URL,
 )
-from opentelemetry.semconv.trace import (
-    MessagingDestinationKindValues,
-    MessagingOperationValues,
+from opentelemetry.semconv._incubating.attributes.server_attributes import (
+    SERVER_ADDRESS,
 )
+from opentelemetry.semconv.trace import MessagingOperationValues
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import SpanKind
 from opentelemetry.trace.span import Span, format_span_id, format_trace_id
@@ -231,9 +229,8 @@ def _assert_injected_span(self, msg_attrs: Dict[str, Any], span: Span):
     def _default_span_attrs(self):
         return {
             MESSAGING_SYSTEM: "aws.sqs",
-            MESSAGING_DESTINATION: self._queue_name,
-            MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-            MESSAGING_URL: self._queue_url,
+            MESSAGING_DESTINATION_NAME: self._queue_name,
+            SERVER_ADDRESS: self._queue_url,
         }
 
     @staticmethod