[release/v1.31.x-0.52bx] api: revert catching BaseException in trace.use_span (#4494) (#4495)

* api: revert catching BaseException in trace.use_span (#4494)

This reverts 1bd9ec6 since it's setting span as error for non error exceptions

Signed-off-by: emdneto <[email protected]>
Co-authored-by: Gregory Borodin <[email protected]>

* fix workflows

Signed-off-by: Emídio Neto <[email protected]>

* skip gen workflows

---------

Signed-off-by: emdneto <[email protected]>
Signed-off-by: Emídio Neto <[email protected]>
Co-authored-by: Gregory Borodin <[email protected]>

Author: emdneto

.github/workflows/contrib.yml

@@ -11,4 +11,4 @@ jobs:
     uses: open-telemetry/opentelemetry-python-contrib/.github/workflows/core_contrib_test_0.yml@main
     with:
       CORE_REPO_SHA: ${{ github.sha }}
-      CONTRIB_REPO_SHA: opentelemetrybot/prepare-release-1.31.0-0.52b0
+      CONTRIB_REPO_SHA: release/v1.31.x-0.52bx

.github/workflows/lint_0.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: opentelemetrybot/prepare-release-1.31.0-0.52b0
+  CONTRIB_REPO_SHA: release/v1.31.x-0.52bx
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/misc_0.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: opentelemetrybot/prepare-release-1.31.0-0.52b0
+  CONTRIB_REPO_SHA: release/v1.31.x-0.52bx
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/test_0.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: opentelemetrybot/prepare-release-1.31.0-0.52b0
+  CONTRIB_REPO_SHA: release/v1.31.x-0.52bx
   PIP_EXISTS_ACTION: w
 
 jobs:

.github/workflows/test_1.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: opentelemetrybot/prepare-release-1.31.0-0.52b0
+  CONTRIB_REPO_SHA: release/v1.31.x-0.52bx
   PIP_EXISTS_ACTION: w
 
 jobs:

CHANGELOG.md

@@ -5,14 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+- api: Revert record `BaseException` change in `trace_api.use_span()`
+  ([#4494](https://github.com/open-telemetry/opentelemetry-python/pull/4494))
+
 ## Version 1.31.0/0.52b0 (2025-03-12)
 
 - semantic-conventions: Bump to 1.31.0
   ([#4471](https://github.com/open-telemetry/opentelemetry-python/pull/4471))
 - Add type annotations to context's attach & detach
   ([#4346](https://github.com/open-telemetry/opentelemetry-python/pull/4346))
 - Fix OTLP encoders missing instrumentation scope schema url and attributes
-  ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))  
+  ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))
 - prometheus-exporter: fix labels out of place for data points with different
   attribute sets
   ([#4413](https://github.com/open-telemetry/opentelemetry-python/pull/4413))

opentelemetry-api/src/opentelemetry/trace/__init__.py

@@ -588,7 +588,10 @@ def use_span(
         finally:
             context_api.detach(token)
 
-    except BaseException as exc:  # pylint: disable=broad-exception-caught
+    # Record only exceptions that inherit Exception class but not BaseException, because
+    # classes that directly inherit BaseException are not technically errors, e.g. GeneratorExit.
+    # See https://github.com/open-telemetry/opentelemetry-python/issues/4484
+    except Exception as exc:  # pylint: disable=broad-exception-caught
         if isinstance(span, Span) and span.is_recording():
             # Record the exception as an event
             if record_exception:

opentelemetry-api/tests/trace/test_globals.py

@@ -1,3 +1,17 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import unittest
 from unittest.mock import Mock, patch
 
@@ -13,7 +27,12 @@ class SpanTest(trace.NonRecordingSpan):
     recorded_status = Status(status_code=StatusCode.UNSET)
 
     def set_status(self, status, description=None):
-        self.recorded_status = status
+        if isinstance(status, Status):
+            self.recorded_status = status
+        else:
+            self.recorded_status = Status(
+                status_code=status, description=description
+            )
 
     def end(self, end_time=None):
         self.has_ended = True
@@ -133,18 +152,6 @@ class TestUseSpanException(Exception):
 
         self.assertEqual(test_span.recorded_exception, exception)
 
-    def test_use_span_base_exception(self):
-        class TestUseSpanBaseException(BaseException):
-            pass
-
-        test_span = SpanTest(trace.INVALID_SPAN_CONTEXT)
-        exception = TestUseSpanBaseException("test exception")
-        with self.assertRaises(TestUseSpanBaseException):
-            with trace.use_span(test_span):
-                raise exception
-
-        self.assertEqual(test_span.recorded_exception, exception)
-
     def test_use_span_set_status(self):
         class TestUseSpanException(Exception):
             pass
@@ -155,10 +162,33 @@ class TestUseSpanException(Exception):
                 raise TestUseSpanException("test error")
 
         self.assertEqual(
-            test_span.recorded_status.status_code,  # type: ignore[reportAttributeAccessIssue]
+            test_span.recorded_status.status_code,
             StatusCode.ERROR,
         )
         self.assertEqual(
-            test_span.recorded_status.description,  # type: ignore[reportAttributeAccessIssue]
+            test_span.recorded_status.description,
             "TestUseSpanException: test error",
         )
+
+    def test_use_span_base_exceptions(self):
+        base_exception_classes = [
+            BaseException,
+            GeneratorExit,
+            SystemExit,
+            KeyboardInterrupt,
+        ]
+
+        for exc_cls in base_exception_classes:
+            with self.subTest(exc=exc_cls.__name__):
+                test_span = SpanTest(trace.INVALID_SPAN_CONTEXT)
+
+                with self.assertRaises(exc_cls):
+                    with trace.use_span(test_span):
+                        raise exc_cls()
+
+                self.assertEqual(
+                    test_span.recorded_status.status_code,
+                    StatusCode.UNSET,
+                )
+                self.assertIsNone(test_span.recorded_status.description)
+                self.assertIsNone(test_span.recorded_exception)