Merge branch 'main' into logs-api-accept-otel-context

Author: tammy-baylis-swi

.github/workflows/benchmarks.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   sdk-benchmarks:
-    runs-on: self-hosted
+    runs-on: equinix-bare-metal
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
       uses: actions/checkout@v4

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- opentelemetry-sdk: Fix invalid `type: ignore` that causes mypy to ignore the whole file
+  ([#4618](https://github.com/open-telemetry/opentelemetry-python/pull/4618))
+- Add `span_exporter` property back to `BatchSpanProcessor` class
+  ([#4621](https://github.com/open-telemetry/opentelemetry-python/pull/4621))
+
 ## Version 1.34.0/0.55b0 (2025-06-04)
 
 - typecheck: add sdk/resources and drop mypy

opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# type: ignore[reportDeprecated]  # ResourceAttributes is deprecated
-
 """
 This package implements `OpenTelemetry Resources
 <https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/sdk.md#resource-sdk>`_:
@@ -58,6 +56,9 @@
 above example.
 """
 
+# ResourceAttributes is deprecated
+# pyright: reportDeprecated=false
+
 import abc
 import concurrent.futures
 import logging

opentelemetry-sdk/src/opentelemetry/sdk/trace/export/__init__.py

@@ -177,6 +177,11 @@ def __init__(
             "Span",
         )
 
+    # Added for backward compatibility. Not recommended to directly access/use underlying exporter.
+    @property
+    def span_exporter(self):
+        return self._batch_processor._exporter  # pylint: disable=protected-access
+
     def on_start(
         self, span: Span, parent_context: Context | None = None
     ) -> None:

opentelemetry-sdk/tests/trace/export/test_export.py

@@ -150,6 +150,11 @@ def test_simple_span_processor_not_sampled(self):
 # before the end of the test, otherwise the worker thread will continue
 # to run after the end of the test.
 class TestBatchSpanProcessor(unittest.TestCase):
+    def test_get_span_exporter(self):
+        exporter = MySpanExporter(destination=[])
+        batch_span_processor = export.BatchSpanProcessor(exporter)
+        self.assertEqual(exporter, batch_span_processor.span_exporter)
+
     @mock.patch.dict(
         "os.environ",
         {