Basic instrumentation for Bedrock runtime Converse api (open-telemetr…

…y#3161) * botocore: add extension for bedrock runtime api * Add tests and handle only non streaming responses * Make it explicit we are handling only the converse operation * Simplify test since all models behaves the same * Add test for error case and rework things a bit * Add converse example * Generate workflows * Add changelog
xrmx · Jan 20, 2025 · 9460773 · 9460773
1 parent 86a7f6b
commit 9460773
Show file tree

Hide file tree

Showing 20 changed files with 1,234 additions and 239 deletions.
diff --git a/.github/workflows/core_contrib_test_0.yml b/.github/workflows/core_contrib_test_0.yml
@@ -349,8 +349,8 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-aws-lambda -- -ra
 
-  py38-test-instrumentation-botocore:
-    name: instrumentation-botocore 
+  py38-test-instrumentation-botocore-0:
+    name: instrumentation-botocore-0 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -369,7 +369,29 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-botocore -- -ra
+        run: tox -e py38-test-instrumentation-botocore-0 -- -ra
+
+  py38-test-instrumentation-botocore-1:
+    name: instrumentation-botocore-1 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python-contrib
+          ref: ${{ env.CONTRIB_REPO_SHA }}
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+          architecture: "x64"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-botocore-1 -- -ra
 
   py38-test-instrumentation-boto3sqs:
     name: instrumentation-boto3sqs 

diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
@@ -1852,8 +1852,8 @@ jobs:
       - name: Run tests
         run: tox -e pypy3-test-instrumentation-aws-lambda -- -ra
 
-  py38-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.8 Ubuntu
+  py38-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.8 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1868,10 +1868,28 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-botocore -- -ra
+        run: tox -e py38-test-instrumentation-botocore-0 -- -ra
 
-  py39-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.9 Ubuntu
+  py38-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.8 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-botocore-1 -- -ra
+
+  py39-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.9 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1886,10 +1904,46 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py39-test-instrumentation-botocore -- -ra
+        run: tox -e py39-test-instrumentation-botocore-0 -- -ra
+
+  py39-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.9 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.9
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.9"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py39-test-instrumentation-botocore-1 -- -ra
+
+  py310-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.10 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.10"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py310-test-instrumentation-botocore-0 -- -ra
 
-  py310-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.10 Ubuntu
+  py310-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.10 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1904,10 +1958,10 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py310-test-instrumentation-botocore -- -ra
+        run: tox -e py310-test-instrumentation-botocore-1 -- -ra
 
-  py311-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.11 Ubuntu
+  py311-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.11 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1922,10 +1976,28 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py311-test-instrumentation-botocore -- -ra
+        run: tox -e py311-test-instrumentation-botocore-0 -- -ra
 
-  py312-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.12 Ubuntu
+  py311-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.11 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py311-test-instrumentation-botocore-1 -- -ra
+
+  py312-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.12 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1940,10 +2012,46 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py312-test-instrumentation-botocore -- -ra
+        run: tox -e py312-test-instrumentation-botocore-0 -- -ra
+
+  py312-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.12 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py312-test-instrumentation-botocore-1 -- -ra
+
+  py313-test-instrumentation-botocore-0_ubuntu-latest:
+    name: instrumentation-botocore-0 3.13 Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.13
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      - name: Install tox
+        run: pip install tox-uv
+
+      - name: Run tests
+        run: tox -e py313-test-instrumentation-botocore-0 -- -ra
 
-  py313-test-instrumentation-botocore_ubuntu-latest:
-    name: instrumentation-botocore 3.13 Ubuntu
+  py313-test-instrumentation-botocore-1_ubuntu-latest:
+    name: instrumentation-botocore-1 3.13 Ubuntu
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -1958,7 +2066,7 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-        run: tox -e py313-test-instrumentation-botocore -- -ra
+        run: tox -e py313-test-instrumentation-botocore-1 -- -ra
 
   py38-test-instrumentation-boto3sqs_ubuntu-latest:
     name: instrumentation-boto3sqs 3.8 Ubuntu
@@ -4407,111 +4515,3 @@ jobs:
 
       - name: Run tests
         run: tox -e py38-test-instrumentation-requests -- -ra
-
-  py39-test-instrumentation-requests_ubuntu-latest:
-    name: instrumentation-requests 3.9 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.9"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py39-test-instrumentation-requests -- -ra
-
-  py310-test-instrumentation-requests_ubuntu-latest:
-    name: instrumentation-requests 3.10 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py310-test-instrumentation-requests -- -ra
-
-  py311-test-instrumentation-requests_ubuntu-latest:
-    name: instrumentation-requests 3.11 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py311-test-instrumentation-requests -- -ra
-
-  py312-test-instrumentation-requests_ubuntu-latest:
-    name: instrumentation-requests 3.12 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.12
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py312-test-instrumentation-requests -- -ra
-
-  py313-test-instrumentation-requests_ubuntu-latest:
-    name: instrumentation-requests 3.13 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.13
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py313-test-instrumentation-requests -- -ra
-
-  py38-test-instrumentation-starlette_ubuntu-latest:
-    name: instrumentation-starlette 3.8 Ubuntu
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.8"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py38-test-instrumentation-starlette -- -ra