Update celery instrumention tests to follow semantic conventions

Author: mriamah

instrumentation/opentelemetry-instrumentation-celery/tests/test_tasks.py

@@ -20,7 +20,12 @@
 from opentelemetry import baggage, context
 from opentelemetry.instrumentation.celery import CeleryInstrumentor, utils
 from opentelemetry.instrumentation.utils import unwrap
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv._incubating.attributes import (
+    exception_attributes as ExceptionAttributes,
+)
+from opentelemetry.semconv._incubating.attributes import (
+    messaging_attributes as SpanAttributes,
+)
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import SpanKind, StatusCode
 
@@ -65,7 +70,7 @@ def test_task(self):
             {
                 "celery.action": "run",
                 "celery.state": "SUCCESS",
-                SpanAttributes.MESSAGING_DESTINATION: "celery",
+                SpanAttributes.MESSAGING_DESTINATION_NAME: "celery",
                 "celery.task_name": "tests.celery_test_tasks.task_add",
             },
         )
@@ -83,8 +88,7 @@ def test_task(self):
             {
                 "celery.action": "apply_async",
                 "celery.task_name": "tests.celery_test_tasks.task_add",
-                SpanAttributes.MESSAGING_DESTINATION_KIND: "queue",
-                SpanAttributes.MESSAGING_DESTINATION: "celery",
+                SpanAttributes.MESSAGING_DESTINATION_NAME: "celery",
             },
         )
 
@@ -117,7 +121,7 @@ def test_task_raises(self):
             {
                 "celery.action": "run",
                 "celery.state": "FAILURE",
-                SpanAttributes.MESSAGING_DESTINATION: "celery",
+                SpanAttributes.MESSAGING_DESTINATION_NAME: "celery",
                 "celery.task_name": "tests.celery_test_tasks.task_raises",
             },
         )
@@ -127,15 +131,17 @@ def test_task_raises(self):
         self.assertEqual(1, len(consumer.events))
         event = consumer.events[0]
 
-        self.assertIn(SpanAttributes.EXCEPTION_STACKTRACE, event.attributes)
+        self.assertIn(
+            ExceptionAttributes.EXCEPTION_STACKTRACE, event.attributes
+        )
 
         # TODO: use plain assertEqual after 1.25 is released (https://github.com/open-telemetry/opentelemetry-python/pull/3837)
         self.assertIn(
-            "CustomError", event.attributes[SpanAttributes.EXCEPTION_TYPE]
+            "CustomError", event.attributes[ExceptionAttributes.EXCEPTION_TYPE]
         )
 
         self.assertEqual(
-            event.attributes[SpanAttributes.EXCEPTION_MESSAGE],
+            event.attributes[ExceptionAttributes.EXCEPTION_MESSAGE],
             "The task failed!",
         )
 
@@ -148,8 +154,7 @@ def test_task_raises(self):
             {
                 "celery.action": "apply_async",
                 "celery.task_name": "tests.celery_test_tasks.task_raises",
-                SpanAttributes.MESSAGING_DESTINATION_KIND: "queue",
-                SpanAttributes.MESSAGING_DESTINATION: "celery",
+                SpanAttributes.MESSAGING_DESTINATION_NAME: "celery",
             },
         )
 

instrumentation/opentelemetry-instrumentation-celery/tests/test_utils.py

@@ -20,7 +20,9 @@
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation.celery import utils
 from opentelemetry.sdk import trace
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv._incubating.attributes import (
+    messaging_attributes as SpanAttributes,
+)
 
 
 class TestUtils(unittest.TestCase):
@@ -51,11 +53,14 @@ def test_set_attributes_from_context(self):
             "44b7f305",
         )
         self.assertEqual(
-            span.attributes.get(SpanAttributes.MESSAGING_CONVERSATION_ID),
+            span.attributes.get(
+                SpanAttributes.MESSAGING_MESSAGE_CONVERSATION_ID
+            ),
             "44b7f305",
         )
         self.assertEqual(
-            span.attributes.get(SpanAttributes.MESSAGING_DESTINATION), "celery"
+            span.attributes.get(SpanAttributes.MESSAGING_DESTINATION_NAME),
+            "celery",
         )
 
         self.assertEqual(