Merge branch 'main' into fix/remove-span-attributes-cassandra

Author: xrmx

CHANGELOG.md

@@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3938](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3938))
 - `opentelemetry-instrumentation-aiohttp-server`: Support passing `TracerProvider` when instrumenting.
   ([#3819](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3819))
+- `opentelemetry-instrumentation-httpx`: add ability to capture custom headers 
+  ([#4047](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/4047))
 
 ### Fixed
 
@@ -38,6 +40,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4001](https://github.com/open-telemetry/opentelemetry-python-contrib/issues/4001))
 - `opentelemetry-instrumentation-psycopg`: Fix `instrument_connection` method to use `_new_cursor_async_factory` on async connections.
   ([#3956](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3956))
+- `opentelemetry-instrumentation-dbapi`: Replace SpanAttributes with semconv constants where applicable 
+  ([#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))
 
 ## Version 1.39.0/0.60b0 (2025-12-03)
 

instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py

@@ -326,7 +326,7 @@ def _instrumented_lambda_handler_call(  # noqa pylint: disable=too-many-branches
                 if span.is_recording():
                     lambda_context = args[1]
                     # NOTE: The specs mention an exception here, allowing the
-                    # `SpanAttributes.CLOUD_RESOURCE_ID` attribute to be set as a span
+                    # `CLOUD_RESOURCE_ID` attribute to be set as a span
                     # attribute instead of a resource attribute.
                     #
                     # See more:

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(

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/__init__.py

@@ -110,7 +110,9 @@ def instrument_consumer(consumer: Consumer, tracer_provider=None)
 from opentelemetry import context, propagate, trace
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
-from opentelemetry.semconv.trace import MessagingOperationValues
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MessagingOperationTypeValues,
+)
 from opentelemetry.trace import Tracer
 
 from .package import _instruments
@@ -363,7 +365,7 @@ def wrap_produce(func, instance, tracer, args, kwargs):
             _enrich_span(
                 span,
                 topic,
-                operation=MessagingOperationValues.RECEIVE,
+                operation=MessagingOperationTypeValues.RECEIVE,
             )  # Replace
             propagate.inject(
                 headers,
@@ -387,7 +389,7 @@ def wrap_poll(func, instance, tracer, args, kwargs):
                     record.topic(),
                     record.partition(),
                     record.offset(),
-                    operation=MessagingOperationValues.PROCESS,
+                    operation=MessagingOperationTypeValues.PROCESS,
                 )
         instance._current_context_token = context.attach(
             trace.set_span_in_context(instance._current_consume_span)
@@ -409,7 +411,7 @@ def wrap_consume(func, instance, tracer, args, kwargs):
                 _enrich_span(
                     instance._current_consume_span,
                     records[0].topic(),
-                    operation=MessagingOperationValues.PROCESS,
+                    operation=MessagingOperationTypeValues.PROCESS,
                 )
 
         instance._current_context_token = context.attach(

instrumentation/opentelemetry-instrumentation-confluent-kafka/src/opentelemetry/instrumentation/confluent_kafka/utils.py

@@ -3,9 +3,14 @@
 
 from opentelemetry import context, propagate
 from opentelemetry.propagators import textmap
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+    MessagingOperationTypeValues,
+)
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
-    MessagingOperationValues,
     SpanAttributes,
 )
 from opentelemetry.trace import Link, SpanKind
@@ -115,12 +120,12 @@ def _enrich_span(
     topic,
     partition: Optional[int] = None,
     offset: Optional[int] = None,
-    operation: Optional[MessagingOperationValues] = None,
+    operation: Optional[MessagingOperationTypeValues] = None,
 ):
     if not span.is_recording():
         return
 
-    span.set_attribute(SpanAttributes.MESSAGING_SYSTEM, "kafka")
+    span.set_attribute(MESSAGING_SYSTEM, "kafka")
     span.set_attribute(SpanAttributes.MESSAGING_DESTINATION, topic)
 
     if partition is not None:
@@ -132,15 +137,15 @@ def _enrich_span(
     )
 
     if operation:
-        span.set_attribute(SpanAttributes.MESSAGING_OPERATION, operation.value)
+        span.set_attribute(MESSAGING_OPERATION, operation.value)
     else:
         span.set_attribute(SpanAttributes.MESSAGING_TEMP_DESTINATION, True)
 
     # https://stackoverflow.com/questions/65935155/identify-and-find-specific-message-in-kafka-topic
     # A message within Kafka is uniquely defined by its topic name, topic partition and offset.
     if partition is not None and offset is not None and topic:
         span.set_attribute(
-            SpanAttributes.MESSAGING_MESSAGE_ID,
+            MESSAGING_MESSAGE_ID,
             f"{topic}.{partition}.{offset}",
         )
 

instrumentation/opentelemetry-instrumentation-confluent-kafka/tests/test_instrumentation.py

@@ -25,6 +25,11 @@
     KafkaContextGetter,
     KafkaContextSetter,
 )
+from opentelemetry.semconv._incubating.attributes.messaging_attributes import (
+    MESSAGING_MESSAGE_ID,
+    MESSAGING_OPERATION,
+    MESSAGING_SYSTEM,
+)
 from opentelemetry.semconv.trace import (
     MessagingDestinationKindValues,
     SpanAttributes,
@@ -122,36 +127,36 @@ def test_poll(self) -> None:
             {
                 "name": "topic-10 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
+                    MESSAGING_OPERATION: "process",
                     SpanAttributes.MESSAGING_KAFKA_PARTITION: 0,
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-10",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-                    SpanAttributes.MESSAGING_MESSAGE_ID: "topic-10.0.0",
+                    MESSAGING_MESSAGE_ID: "topic-10.0.0",
                 },
             },
             {"name": "recv", "attributes": {}},
             {
                 "name": "topic-20 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
+                    MESSAGING_OPERATION: "process",
                     SpanAttributes.MESSAGING_KAFKA_PARTITION: 2,
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-20",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-                    SpanAttributes.MESSAGING_MESSAGE_ID: "topic-20.2.4",
+                    MESSAGING_MESSAGE_ID: "topic-20.2.4",
                 },
             },
             {"name": "recv", "attributes": {}},
             {
                 "name": "topic-30 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
+                    MESSAGING_OPERATION: "process",
                     SpanAttributes.MESSAGING_KAFKA_PARTITION: 1,
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-30",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-                    SpanAttributes.MESSAGING_MESSAGE_ID: "topic-30.1.3",
+                    MESSAGING_MESSAGE_ID: "topic-30.1.3",
                 },
             },
             {"name": "recv", "attributes": {}},
@@ -190,8 +195,8 @@ def test_consume(self) -> None:
             {
                 "name": "topic-1 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_OPERATION: "process",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-1",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
                 },
@@ -200,8 +205,8 @@ def test_consume(self) -> None:
             {
                 "name": "topic-2 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_OPERATION: "process",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-2",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
                 },
@@ -210,8 +215,8 @@ def test_consume(self) -> None:
             {
                 "name": "topic-3 process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_OPERATION: "process",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-3",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
                 },
@@ -247,12 +252,12 @@ def test_close(self) -> None:
             {
                 "name": "topic-a process",
                 "attributes": {
-                    SpanAttributes.MESSAGING_OPERATION: "process",
+                    MESSAGING_OPERATION: "process",
                     SpanAttributes.MESSAGING_KAFKA_PARTITION: 0,
-                    SpanAttributes.MESSAGING_SYSTEM: "kafka",
+                    MESSAGING_SYSTEM: "kafka",
                     SpanAttributes.MESSAGING_DESTINATION: "topic-a",
                     SpanAttributes.MESSAGING_DESTINATION_KIND: MessagingDestinationKindValues.QUEUE.value,
-                    SpanAttributes.MESSAGING_MESSAGE_ID: "topic-a.0.0",
+                    MESSAGING_MESSAGE_ID: "topic-a.0.0",
                 },
             },
         ]

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

@@ -184,7 +184,16 @@
     is_instrumentation_enabled,
     unwrap,
 )
-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.trace import SpanKind, TracerProvider, get_tracer
 from opentelemetry.util._importlib_metadata import version as util_version
 
@@ -547,13 +556,13 @@ def get_connection_attributes(self, connection: object) -> None:
         if user and isinstance(user, bytes):
             user = user.decode()
         if user is not None:
-            self.span_attributes[SpanAttributes.DB_USER] = str(user)
+            self.span_attributes[DB_USER] = str(user)
         host = self.connection_props.get("host")
         if host is not None:
-            self.span_attributes[SpanAttributes.NET_PEER_NAME] = host
+            self.span_attributes[NET_PEER_NAME] = host
         port = self.connection_props.get("port")
         if port is not None:
-            self.span_attributes[SpanAttributes.NET_PEER_PORT] = port
+            self.span_attributes[NET_PEER_PORT] = port
 
 
 # pylint: disable=abstract-method
@@ -667,13 +676,9 @@ def _populate_span(
         if not span.is_recording():
             return
         statement = self.get_statement(cursor, args)
-        span.set_attribute(
-            SpanAttributes.DB_SYSTEM, self._db_api_integration.database_system
-        )
-        span.set_attribute(
-            SpanAttributes.DB_NAME, self._db_api_integration.database
-        )
-        span.set_attribute(SpanAttributes.DB_STATEMENT, statement)
+        span.set_attribute(DB_SYSTEM, self._db_api_integration.database_system)
+        span.set_attribute(DB_NAME, self._db_api_integration.database)
+        span.set_attribute(DB_STATEMENT, statement)
 
         for (
             attribute_key,