refactor old spanattrs to new

Author: weslayer

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

@@ -43,10 +43,18 @@
     unwrap,
 )
 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_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+    MESSAGING_URL,
+)
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
     MessagingOperationValues,
-    SpanAttributes,
 )
 from opentelemetry.trace import Link, Span, SpanKind, Tracer, TracerProvider
 
@@ -151,24 +159,20 @@ def _enrich_span(
     ) -> None:
         if not span.is_recording():
             return
-        span.set_attribute(SpanAttributes.MESSAGING_SYSTEM, "aws.sqs")
-        span.set_attribute(SpanAttributes.MESSAGING_DESTINATION, queue_name)
+        span.set_attribute(MESSAGING_SYSTEM, "aws.sqs")
+        span.set_attribute(MESSAGING_DESTINATION, queue_name)
         span.set_attribute(
-            SpanAttributes.MESSAGING_DESTINATION_KIND,
+            MESSAGING_DESTINATION_KIND,
             MessagingDestinationKindValues.QUEUE.value,
         )
-        span.set_attribute(SpanAttributes.MESSAGING_URL, queue_url)
+        span.set_attribute(MESSAGING_URL, queue_url)
 
         if operation:
-            span.set_attribute(
-                SpanAttributes.MESSAGING_OPERATION, operation.value
-            )
+            span.set_attribute(MESSAGING_OPERATION, operation.value)
         if conversation_id:
-            span.set_attribute(
-                SpanAttributes.MESSAGING_CONVERSATION_ID, conversation_id
-            )
+            span.set_attribute(MESSAGING_CONVERSATION_ID, conversation_id)
         if message_id:
-            span.set_attribute(SpanAttributes.MESSAGING_MESSAGE_ID, message_id)
+            span.set_attribute(MESSAGING_MESSAGE_ID, message_id)
 
     @staticmethod
     def _safe_end_processing_span(receipt_handle: str) -> None:
@@ -239,9 +243,7 @@ def send_wrapper(wrapped, instance, args, kwargs):
                 message_id = retval.get("MessageId")
                 if message_id:
                     if span.is_recording():
-                        span.set_attribute(
-                            SpanAttributes.MESSAGING_MESSAGE_ID, message_id
-                        )
+                        span.set_attribute(MESSAGING_MESSAGE_ID, message_id)
                 return retval
 
         wrap_function_wrapper(sqs_class, "send_message", send_wrapper)
@@ -284,7 +286,7 @@ def send_batch_wrapper(wrapped, instance, args, kwargs):
                 if message_span:
                     if message_span.is_recording():
                         message_span.set_attribute(
-                            SpanAttributes.MESSAGING_MESSAGE_ID,
+                            MESSAGING_MESSAGE_ID,
                             successful_messages.get("MessageId"),
                         )
             for span in ids_to_spans.values():

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

@@ -27,10 +27,17 @@
     Boto3SQSInstrumentor,
     Boto3SQSSetter,
 )
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_DESTINATION,
+    MESSAGING_DESTINATION_KIND,
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+    MESSAGING_URL,
+)
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
     MessagingOperationValues,
-    SpanAttributes,
 )
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import SpanKind
@@ -223,10 +230,10 @@ def _assert_injected_span(self, msg_attrs: Dict[str, Any], span: Span):
 
     def _default_span_attrs(self):
         return {
-            SpanAttributes.MESSAGING_SYSTEM: "aws.sqs",
-            SpanAttributes.MESSAGING_DESTINATION: self._queue_name,
-            SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-            SpanAttributes.MESSAGING_URL: self._queue_url,
+            MESSAGING_SYSTEM: "aws.sqs",
+            MESSAGING_DESTINATION: self._queue_name,
+            MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
+            MESSAGING_URL: self._queue_url,
         }
 
     @staticmethod
@@ -282,7 +289,7 @@ def test_send_message(self):
         self.assertEqual(SpanKind.PRODUCER, span.kind)
         self.assertEqual(
             {
-                SpanAttributes.MESSAGING_MESSAGE_ID: message_id,
+                MESSAGING_MESSAGE_ID: message_id,
                 **self._default_span_attrs(),
             },
             span.attributes,
@@ -321,7 +328,7 @@ def test_receive_message(self):
         self.assertEqual(SpanKind.CONSUMER, span.kind)
         self.assertEqual(
             {
-                SpanAttributes.MESSAGING_OPERATION: MessagingOperationValues.RECEIVE.value,
+                MESSAGING_OPERATION: MessagingOperationValues.RECEIVE.value,
                 **self._default_span_attrs(),
             },
             span.attributes,
@@ -345,8 +352,8 @@ def test_receive_message(self):
             # processing span attributes
             self.assertEqual(
                 {
-                    SpanAttributes.MESSAGING_MESSAGE_ID: msg_id,
-                    SpanAttributes.MESSAGING_OPERATION: MessagingOperationValues.PROCESS.value,
+                    MESSAGING_MESSAGE_ID: msg_id,
+                    MESSAGING_OPERATION: MessagingOperationValues.PROCESS.value,
                     **self._default_span_attrs(),
                 },
                 span.attributes,

mypy.ini

@@ -0,0 +1,2 @@
+[mypy-wrapt]
+ignore_missing_imports = True