opentelemetry-instrumentation-botocore 0.52b1__py3-none-any.whl → 0.53b0__py3-none-any.whl

opentelemetry/instrumentation/botocore/__init__.py

@@ -28,7 +28,7 @@ Usage
 .. code:: python
 
     from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
-    import botocore
+    import botocore.session
 
 
     # Instrument Botocore
@@ -39,7 +39,7 @@ Usage
     session.set_credentials(
         access_key="access-key", secret_key="secret-key"
     )
-    ec2 = self.session.create_client("ec2", region_name="us-west-2")
+    ec2 = session.create_client("ec2", region_name="us-west-2")
     ec2.describe_instances()
 
 API
@@ -58,13 +58,15 @@ for example:
 .. code: python
 
     from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
-    import botocore
+    import botocore.session
 
     def request_hook(span, service_name, operation_name, api_params):
         # request hook logic
+        pass
 
     def response_hook(span, service_name, operation_name, result):
         # response hook logic
+        pass
 
     # Instrument Botocore with hooks
     BotocoreInstrumentor().instrument(request_hook=request_hook, response_hook=response_hook)
@@ -74,40 +76,8 @@ for example:
     session.set_credentials(
         access_key="access-key", secret_key="secret-key"
     )
-    ec2 = self.session.create_client("ec2", region_name="us-west-2")
+    ec2 = session.create_client("ec2", region_name="us-west-2")
     ec2.describe_instances()
-
-Extensions
-----------
-
-The instrumentation supports creating extensions for AWS services for enriching what is collected. We have extensions
-for the following AWS services:
-
-- Bedrock Runtime
-- DynamoDB
-- Lambda
-- SNS
-- SQS
-
-Bedrock Runtime
-***************
-
-This extension implements the GenAI semantic conventions for the following API calls:
-
-- Converse
-- ConverseStream
-- InvokeModel
-- InvokeModelWithResponseStream
-
-For the Converse and ConverseStream APIs tracing, events and metrics are implemented.
-
-For the InvokeModel and InvokeModelWithResponseStream APIs tracing, events and metrics implemented only for a subset of
-the available models, namely:
-- Amazon Titan models
-- Amazon Nova models
-- Anthropic Claude
-
-There is no support for tool calls with Amazon Models for the InvokeModel and InvokeModelWithResponseStream APIs.
 """
 
 import logging

opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py

@@ -216,7 +216,6 @@ class InvokeModelWithResponseStreamWrapper(ObjectProxy):
 
     def _process_amazon_nova_chunk(self, chunk):
         # pylint: disable=too-many-branches
-        # TODO:  handle tool calls!
         if "messageStart" in chunk:
             # {'messageStart': {'role': 'assistant'}}
             if chunk["messageStart"].get("role") == "assistant":
@@ -224,17 +223,40 @@ class InvokeModelWithResponseStreamWrapper(ObjectProxy):
                 self._message = {"role": "assistant", "content": []}
             return
 
+        if "contentBlockStart" in chunk:
+            # {'contentBlockStart': {'start': {'toolUse': {'toolUseId': 'id', 'name': 'name'}}, 'contentBlockIndex': 31}}
+            if self._record_message:
+                self._message["content"].append(self._content_block)
+
+                start = chunk["contentBlockStart"].get("start", {})
+                if "toolUse" in start:
+                    self._content_block = start
+                else:
+                    self._content_block = {}
+            return
+
         if "contentBlockDelta" in chunk:
             # {'contentBlockDelta': {'delta': {'text': "Hello"}, 'contentBlockIndex': 0}}
+            # {'contentBlockDelta': {'delta': {'toolUse': {'input': '{"location":"San Francisco"}'}}, 'contentBlockIndex': 31}}
             if self._record_message:
                 delta = chunk["contentBlockDelta"].get("delta", {})
                 if "text" in delta:
                     self._content_block.setdefault("text", "")
                     self._content_block["text"] += delta["text"]
+                elif "toolUse" in delta:
+                    self._content_block.setdefault("toolUse", {})
+                    self._content_block["toolUse"]["input"] = json.loads(
+                        delta["toolUse"]["input"]
+                    )
             return
 
         if "contentBlockStop" in chunk:
             # {'contentBlockStop': {'contentBlockIndex': 0}}
+            if self._record_message:
+                # create a new content block only for tools
+                if "toolUse" in self._content_block:
+                    self._message["content"].append(self._content_block)
+                    self._content_block = {}
             return
 
         if "messageStop" in chunk:

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.52b1"
+__version__ = "0.53b0"

{opentelemetry_instrumentation_botocore-0.52b1.dist-info → opentelemetry_instrumentation_botocore-0.53b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentelemetry-instrumentation-botocore
-Version: 0.52b1
+Version: 0.53b0
 Summary: OpenTelemetry Botocore instrumentation
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-botocore
 Project-URL: Repository, https://github.com/open-telemetry/opentelemetry-python-contrib
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.30
-Requires-Dist: opentelemetry-instrumentation==0.52b1
+Requires-Dist: opentelemetry-instrumentation==0.53b0
 Requires-Dist: opentelemetry-propagator-aws-xray~=1.0
-Requires-Dist: opentelemetry-semantic-conventions==0.52b1
+Requires-Dist: opentelemetry-semantic-conventions==0.53b0
 Provides-Extra: instruments
 Requires-Dist: botocore~=1.0; extra == 'instruments'
 Description-Content-Type: text/x-rst
@@ -37,6 +37,44 @@ OpenTelemetry Botocore Tracing
 
 This library allows tracing requests made by the Botocore library.
 
+Extensions
+----------
+
+The instrumentation supports creating extensions for AWS services for enriching what is collected. We have extensions
+for the following AWS services:
+
+- Bedrock Runtime
+- DynamoDB
+- Lambda
+- SNS
+- SQS
+
+Bedrock Runtime
+***************
+
+This extension implements the GenAI semantic conventions for the following API calls:
+
+- Converse
+- ConverseStream
+- InvokeModel
+- InvokeModelWithResponseStream
+
+For the Converse and ConverseStream APIs tracing, events and metrics are implemented.
+
+For the InvokeModel and InvokeModelWithResponseStream APIs tracing, events and metrics implemented only for a subset of
+the available models, namely:
+
+- Amazon Titan models
+- Amazon Nova models
+- Anthropic Claude
+
+Tool calls with InvokeModel and InvokeModelWithResponseStream APIs are supported with:
+
+- Amazon Nova models
+- Anthropic Claude 3+
+
+If you don't have an application using Bedrock APIs yet, try our `zero-code examples <examples/bedrock-runtime/zero-code>`_.
+
 Installation
 ------------
 

{opentelemetry_instrumentation_botocore-0.52b1.dist-info → opentelemetry_instrumentation_botocore-0.53b0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-opentelemetry/instrumentation/botocore/__init__.py,sha256=3kgHjhP9dxM3ZsjPCYtLtZKwOwL5Rc16UM3K837qHmg,15368
+opentelemetry/instrumentation/botocore/__init__.py,sha256=vqJdCimwcLKwvGfXvsT-UW4PD5R0MLb4xPAB1Xdk_Lo,14565
 opentelemetry/instrumentation/botocore/environment_variables.py,sha256=c1lrIEj5wwxZwLd5ppJsfGADBfQLnb_HuxXDLv7ul6s,114
 opentelemetry/instrumentation/botocore/package.py,sha256=6xvfRpU_C3wlSO6pto7MhGtkPoCHDEiRO_Fh4DiC_50,622
-opentelemetry/instrumentation/botocore/version.py,sha256=baY9XBULpMqGtC6b52xBndx8f8B0qgZQnvEAOxvK-bs,608
+opentelemetry/instrumentation/botocore/version.py,sha256=YINz8iltPDXGMAPN-XzoMRWHV-bhEWau0Rniz-pK9c0,608
 opentelemetry/instrumentation/botocore/extensions/__init__.py,sha256=IqMWsCI0HL8gvL8-0Svn9Rp7dz2HKMcIuhRRM0twmCU,1857
 opentelemetry/instrumentation/botocore/extensions/_messaging.py,sha256=ca2Uwyb1vxWu5qUkKTlfn9KJFN6k8HOTrrBYvwX4WzA,1636
 opentelemetry/instrumentation/botocore/extensions/bedrock.py,sha256=fF_SdRGZzTyGDprlffh84bMVQhq3AZMcMAZAUTj1SDA,27814
-opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py,sha256=KMYlLigPaHxQq8nLQ0L0FHFEpwuVpYKIP9VugyKcysE,19430
+opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py,sha256=vR_INPz0UeT_ShajwZdLbXcys6mOmXSHwOxP3gR139I,20555
 opentelemetry/instrumentation/botocore/extensions/dynamodb.py,sha256=cmTzHnLCO731v8L5wN-rPRyVgQHmRvH3tuG5wrFhqyA,13745
 opentelemetry/instrumentation/botocore/extensions/lmbd.py,sha256=mqPbgwDFy3XYg-pLo6A6eNu0iKSGa2-tPLwroJDuavY,4253
 opentelemetry/instrumentation/botocore/extensions/sns.py,sha256=MfppfL91tAbAjp6CIiqvYIuXQRq-PeIYbB1ZKWO5kW4,5334
 opentelemetry/instrumentation/botocore/extensions/sqs.py,sha256=9_LjlzQ0Sg92hgaL8P31cbpq_C71qCTucjj0SX1Ct5o,2916
 opentelemetry/instrumentation/botocore/extensions/types.py,sha256=jCIJXt0Zvdn2qVwX6bLUaCLgBPy6XyJ-nYEwurxAZo8,6681
-opentelemetry_instrumentation_botocore-0.52b1.dist-info/METADATA,sha256=FAGsr0h-an9gy7r3X6vxZAKmkmC3W1-hfuFZ4kPU6q4,2122
-opentelemetry_instrumentation_botocore-0.52b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-opentelemetry_instrumentation_botocore-0.52b1.dist-info/entry_points.txt,sha256=v5hzQbZMJ61JuhBNq5jHYAapvv3C_486h9CTqxlkUTM,100
-opentelemetry_instrumentation_botocore-0.52b1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation_botocore-0.52b1.dist-info/RECORD,,
+opentelemetry_instrumentation_botocore-0.53b0.dist-info/METADATA,sha256=zvCs12ew7IQoEPdMNJH_Uz4G8D8KCuCcJfDvf7X_s1s,3101
+opentelemetry_instrumentation_botocore-0.53b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+opentelemetry_instrumentation_botocore-0.53b0.dist-info/entry_points.txt,sha256=v5hzQbZMJ61JuhBNq5jHYAapvv3C_486h9CTqxlkUTM,100
+opentelemetry_instrumentation_botocore-0.53b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation_botocore-0.53b0.dist-info/RECORD,,