opentelemetry-instrumentation-celery: remove usage of deprecated SpanAttributes where applicable (#4056)

* refactor: remove usage of deprecated SpanAttributes where applicable

* update CHANGELOG.md

* fix lint and formatting errors

* fix CHANGELOG.md

---------

Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>

Author: herin049

CHANGELOG.md

@@ -44,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4058](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4058))
 - `opentelemetry-instrumentation-django`: Replace SpanAttributes with semconv constants where applicable 
   ([#4059](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4059))
+- `opentelemetry-instrumentation-celery`: Replace SpanAttributes with semconv constants where applicable
+  ([#4056](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4056))
 - `opentelemetry-instrumentation-confluent-kafka`: Replace SpanAttributes with semconv constants where applicable
   ([#4057](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4057))
 

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

@@ -76,7 +76,9 @@ def add(x, y):
 from opentelemetry.metrics import get_meter
 from opentelemetry.propagate import extract, inject
 from opentelemetry.propagators.textmap import Getter
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+)
 from opentelemetry.trace.status import Status, StatusCode
 
 if VERSION >= (4, 0, 1):
@@ -240,7 +242,7 @@ def _trace_before_publish(self, *args, **kwargs):
         # apply some attributes here because most of the data is not available
         if span.is_recording():
             span.set_attribute(_TASK_TAG_KEY, _TASK_APPLY_ASYNC)
-            span.set_attribute(SpanAttributes.MESSAGING_MESSAGE_ID, task_id)
+            span.set_attribute(MESSAGING_MESSAGE_ID, task_id)
             span.set_attribute(_TASK_NAME_KEY, task_name)
             utils.set_attributes_from_context(span, kwargs)
 

instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/utils.py

@@ -20,6 +20,9 @@
 from celery import registry  # pylint: disable=no-name-in-module
 from celery.app.task import Task
 
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import Span
 
@@ -98,7 +101,7 @@ def set_attributes_from_context(span, context):
             value = str(value)
 
         elif key == "id":
-            attribute_name = SpanAttributes.MESSAGING_MESSAGE_ID
+            attribute_name = MESSAGING_MESSAGE_ID
 
         elif key == "correlation_id":
             attribute_name = SpanAttributes.MESSAGING_CONVERSATION_ID

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

@@ -20,11 +20,22 @@
 from opentelemetry import baggage, context
 from opentelemetry.instrumentation.celery import CeleryInstrumentor, utils
 from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.semconv.attributes.exception_attributes import (
+    EXCEPTION_MESSAGE,
+    EXCEPTION_STACKTRACE,
+    EXCEPTION_TYPE,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import SpanKind, StatusCode
 
-from .celery_test_tasks import app, task_add, task_raises, task_returns_baggage
+from .celery_test_tasks import (
+    CustomError,
+    app,
+    task_add,
+    task_raises,
+    task_returns_baggage,
+)
 
 
 class TestCeleryInstrumentation(TestBase):
@@ -127,15 +138,15 @@ def test_task_raises(self):
         self.assertEqual(1, len(consumer.events))
         event = consumer.events[0]
 
-        self.assertIn(SpanAttributes.EXCEPTION_STACKTRACE, event.attributes)
+        self.assertIn(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]
+        self.assertEqual(
+            f"{CustomError.__module__}.{CustomError.__qualname__}",
+            event.attributes[EXCEPTION_TYPE],
         )
 
         self.assertEqual(
-            event.attributes[SpanAttributes.EXCEPTION_MESSAGE],
+            event.attributes[EXCEPTION_MESSAGE],
             "The task failed!",
         )
 

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

@@ -20,6 +20,9 @@
 from opentelemetry import trace as trace_api
 from opentelemetry.instrumentation.celery import utils
 from opentelemetry.sdk import trace
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+)
 from opentelemetry.semconv.trace import SpanAttributes
 
 
@@ -47,7 +50,7 @@ def test_set_attributes_from_context(self):
         utils.set_attributes_from_context(span, context)
 
         self.assertEqual(
-            span.attributes.get(SpanAttributes.MESSAGING_MESSAGE_ID),
+            span.attributes.get(MESSAGING_MESSAGE_ID),
             "44b7f305",
         )
         self.assertEqual(