[chore] Sync OpenTelemetry upstream main.

CHANGELOG.md

@@ -11,11 +11,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-- `opentelemetry-instrumentation-requests`, `opentelemetry-instrumentation-wsgi`, `opentelemetry-instrumentation-asgi` Detect synthetic sources on requests, ASGI, and WSGI.
-  ([#3674](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3674))
+## Version 1.39.0/0.60b0 (2025-12-03)
 
 ### Added 
 
+- `opentelemetry-instrumentation-requests`, `opentelemetry-instrumentation-wsgi`, `opentelemetry-instrumentation-asgi` Detect synthetic sources on requests, ASGI, and WSGI.
+  ([#3674](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3674))
 - `opentelemetry-instrumentation-aiohttp-client`: add support for url exclusions via `OTEL_PYTHON_EXCLUDED_URLS` / `OTEL_PYTHON_AIOHTTP_CLIENT_EXCLUDED_URLS`
   ([#3850](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3850))
 - `opentelemetry-instrumentation-httpx`: add support for url exclusions via `OTEL_PYTHON_EXCLUDED_URLS` / `OTEL_PYTHON_HTTPX_EXCLUDED_URLS`
@@ -42,6 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- `opentelemetry-instrumentation-botocore`: bedrock: Add safety check for bedrock ConverseStream responses
+  ([#3990](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3990))
 - `opentelemetry-instrumentation-botocore`: bedrock: only decode JSON input buffer in Anthropic Claude streaming
   ([#3875](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3875))
 - `opentelemetry-instrumentation-aiohttp-client`, `opentelemetry-instrumentation-aiohttp-server`: Fix readme links and text

_template/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

eachdist.ini

@@ -16,7 +16,7 @@ sortfirst=
     ext/*
 
 [stable]
-version=1.39.0.dev
+version=1.40.0.dev
 
 packages=
     opentelemetry-sdk
@@ -35,7 +35,7 @@ packages=
     opentelemetry-exporter-credential-provider-gcp
 
 [prerelease]
-version=0.60b0.dev
+version=0.61b0.dev
 
 packages=
     all

exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

exporter/opentelemetry-exporter-richconsole/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   "opentelemetry-sdk ~= 1.12",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "rich>=10.0.0",
 ]
 

exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml

@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.5",
-  "opentelemetry-instrumentation == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-aio-pika/src/opentelemetry/instrumentation/aio_pika/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml

@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
-  "opentelemetry-util-http == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
+  "opentelemetry-util-http == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml

@@ -26,9 +26,9 @@ classifiers = [
 ]
 dependencies = [
     "opentelemetry-api ~= 1.12",
-    "opentelemetry-instrumentation == 0.60b0.dev",
-    "opentelemetry-semantic-conventions == 0.60b0.dev",
-    "opentelemetry-util-http == 0.60b0.dev",
+    "opentelemetry-instrumentation == 0.61b0.dev",
+    "opentelemetry-semantic-conventions == 0.61b0.dev",
+    "opentelemetry-util-http == 0.61b0.dev",
     "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aiokafka/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.27",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "typing_extensions ~= 4.1",
 ]
 

instrumentation/opentelemetry-instrumentation-aiokafka/src/opentelemetry/instrumentation/aiokafka/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-instrumentation-dbapi == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-instrumentation-dbapi == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml

@@ -27,9 +27,9 @@ classifiers = [
 dependencies = [
   "asgiref ~= 3.0",
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
-  "opentelemetry-util-http == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
+  "opentelemetry-util-http == 0.61b0.dev",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-asyncclick/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "wrapt ~= 1.0",
   "typing_extensions ~= 4.12",
 ]

instrumentation/opentelemetry-instrumentation-asyncclick/src/opentelemetry/instrumentation/asyncclick/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.14",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-asyncio/src/opentelemetry/instrumentation/asyncio/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "opentelemetry-propagator-aws-xray ~= 1.0",
 ]
 

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

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-boto/pyproject.toml

@@ -25,8 +25,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
 ]
 
 [project.optional-dependencies]

instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-boto3sqs/src/opentelemetry/instrumentation/boto3sqs/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.37",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "opentelemetry-propagator-aws-xray ~= 1.0",
 ]
 

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py

@@ -528,7 +528,9 @@ def __init__(
     def from_converse(
         cls, response: dict[str, Any], capture_content: bool
     ) -> _Choice:
-        orig_message = response["output"]["message"]
+        # be defensive about malformed responses, refer to #3958 for more context
+        output = response.get("output", {})
+        orig_message = output.get("message", {})
         if role := orig_message.get("role"):
             message = {"role": role}
         else:
@@ -537,8 +539,8 @@ def from_converse(
 
         if tool_calls := extract_tool_calls(orig_message, capture_content):
             message["tool_calls"] = tool_calls
-        elif capture_content:
-            message["content"] = orig_message["content"]
+        elif capture_content and (content := orig_message.get("content")):
+            message["content"] = content
 
         return cls(message, response["stopReason"], index=0)
 

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-botocore/tests/test_botocore_bedrock.py

@@ -27,6 +27,7 @@
 
 from opentelemetry.instrumentation.botocore.extensions.bedrock_utils import (
     InvokeModelWithResponseStreamWrapper,
+    _Choice,
 )
 from opentelemetry.semconv._incubating.attributes.error_attributes import (
     ERROR_TYPE,
@@ -3051,6 +3052,16 @@ def stream_error_callback(exc, ended):
         assert "input" not in tool_block
 
 
+def test_converse_stream_with_missing_output_in_response():
+    # Test malformed response missing "output" key
+    malformed_response = {"stopReason": "end_turn"}
+    choice = _Choice.from_converse(malformed_response, capture_content=True)
+
+    assert choice.finish_reason == "end_turn"
+    assert choice.message == {}
+    assert choice.index == 0
+
+
 def amazon_nova_messages():
     return [
         {"role": "user", "content": [{"text": "Say this is a test"}]},

instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-cassandra/src/opentelemetry/instrumentation/cassandra/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-celery/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
 ]
 
 [project.optional-dependencies]

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

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"

instrumentation/opentelemetry-instrumentation-click/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.12",
-  "opentelemetry-instrumentation == 0.60b0.dev",
-  "opentelemetry-semantic-conventions == 0.60b0.dev",
+  "opentelemetry-instrumentation == 0.61b0.dev",
+  "opentelemetry-semantic-conventions == 0.61b0.dev",
   "wrapt >= 1.0.0, < 2.0.0",
 ]
 

instrumentation/opentelemetry-instrumentation-click/src/opentelemetry/instrumentation/click/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.60b0.dev"
+__version__ = "0.61b0.dev"