Remove add_baggage() from OpenTelemetryScope

The method had an unpaired context.attach() that leaked context tokens.
Users should use BaggageBuilder.build() context manager instead, which
properly restores the previous context on exit.

Co-authored-by: nikhilNava <211831449+nikhilNava@users.noreply.github.com>

Author: Copilot

libraries/microsoft-agents-a365-observability-core/microsoft_agents_a365/observability/core/opentelemetry_scope.py

@@ -9,7 +9,7 @@
 from threading import Lock
 from typing import TYPE_CHECKING, Any
 
-from opentelemetry import baggage, context, trace
+from opentelemetry import context, trace
 from opentelemetry.trace import (
     Span,
     SpanKind,
@@ -126,7 +126,6 @@ def __init__(
         self._error_type: str | None = None
         self._exception: Exception | None = None
         self._context_token = None
-        self._baggage_tokens: list[object] = []
 
         if self._is_telemetry_enabled():
             tracer = self._get_tracer()
@@ -242,29 +241,6 @@ def set_tag_maybe(self, name: str, value: Any) -> None:
         if value is not None and self._span and self._is_telemetry_enabled():
             self._span.set_attribute(name, value)
 
-    def add_baggage(self, key: str, value: str) -> None:
-        """Add baggage to the current context.
-
-        .. warning::
-            This method attaches a new context that cannot be detached. Prefer using
-            :class:`~microsoft_agents_a365.observability.core.middleware.baggage_builder.BaggageBuilder`
-            with its context-manager API (``with builder.build(): ...``) which properly
-            restores the previous context on exit.
-
-        Args:
-            key: The baggage key
-            value: The baggage value
-        """
-        # Set baggage in the current context
-        if self._is_telemetry_enabled():
-            # Set baggage on the current context
-            # This will be inherited by child spans created within this context
-            baggage_context = baggage.set_baggage(key, value)
-            # The context needs to be made current for child spans to inherit the baggage
-            token = context.attach(baggage_context)
-            # Store the token so it can be detached when the scope ends
-            self._baggage_tokens.append(token)
-
     def record_attributes(self, attributes: dict[str, Any] | list[tuple[str, Any]]) -> None:
         """Record multiple attribute key/value pairs for telemetry tracking.
 
@@ -303,11 +279,6 @@ def _end(self) -> None:
             span_id = f"{self._span.context.span_id:016x}" if self._span.context else "unknown"
             logger.info(f"Span ended: '{self._span.name}' ({span_id})")
 
-            # Detach any baggage tokens in reverse order
-            for token in reversed(self._baggage_tokens):
-                context.detach(token)
-            self._baggage_tokens.clear()
-
             # Convert custom end time to OTel-compatible format (nanoseconds since epoch)
             otel_end_time = self._datetime_to_ns(self._custom_end_time)
             if otel_end_time is not None: