Merge branch 'main' into prometheus_exporter

open-telemetry · Nov 9, 2024 · 2e3ca96 · 2e3ca96
2 parents a4d4b47 + ca774ee
commit 2e3ca96
Show file tree

Hide file tree

Showing 17 changed files with 704 additions and 39 deletions.
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -23,7 +23,6 @@ jobs:
   check-links:
     runs-on: ubuntu-latest
     needs: changedfiles
-    if:
     if: |
       github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
       && ${{needs.changedfiles.outputs.md}}
@@ -34,7 +33,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install markdown-link-check
-        run: npm install -g markdown-link-check
+        run: npm install -g markdown-link-check@v3.12.2
 
       - name: Run markdown-link-check
         run: |

diff --git a/.github/workflows/contrib_0.yml b/.github/workflows/contrib_0.yml
@@ -16,8 +16,8 @@ env:
 
 jobs:
 
-  py38-test-instrumentation-openai-v2:
-    name: instrumentation-openai-v2 
+  py38-test-instrumentation-openai-v2-0:
+    name: instrumentation-openai-v2-0 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -42,7 +42,35 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e py38-test-instrumentation-openai-v2 -- -ra
+        run: tox -e py38-test-instrumentation-openai-v2-0 -- -ra
+
+  py38-test-instrumentation-openai-v2-1:
+    name: instrumentation-openai-v2-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: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - 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
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-openai-v2-1 -- -ra
 
   py38-test-resource-detector-container:
     name: resource-detector-container 
@@ -72,8 +100,8 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-resource-detector-container -- -ra
 
-  py38-test-resource-detector-azure:
-    name: resource-detector-azure 
+  py38-test-resource-detector-azure-0:
+    name: resource-detector-azure-0 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -98,10 +126,10 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e py38-test-resource-detector-azure -- -ra
+        run: tox -e py38-test-resource-detector-azure-0 -- -ra
 
-  py38-test-sdk-extension-aws:
-    name: sdk-extension-aws 
+  py38-test-resource-detector-azure-1:
+    name: resource-detector-azure-1 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -126,7 +154,63 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e py38-test-sdk-extension-aws -- -ra
+        run: tox -e py38-test-resource-detector-azure-1 -- -ra
+
+  py38-test-sdk-extension-aws-0:
+    name: sdk-extension-aws-0 
+    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: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - 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
+
+      - name: Run tests
+        run: tox -e py38-test-sdk-extension-aws-0 -- -ra
+
+  py38-test-sdk-extension-aws-1:
+    name: sdk-extension-aws-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: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - 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
+
+      - name: Run tests
+        run: tox -e py38-test-sdk-extension-aws-1 -- -ra
 
   py38-test-distro:
     name: distro 
@@ -1584,6 +1668,34 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-instrumentation-sqlalchemy-1 -- -ra
 
+  py38-test-instrumentation-sqlalchemy-2:
+    name: instrumentation-sqlalchemy-2 
+    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: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - 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
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-sqlalchemy-2 -- -ra
+
   py38-test-instrumentation-redis:
     name: instrumentation-redis 
     runs-on: ubuntu-latest
@@ -1864,8 +1976,36 @@ jobs:
       - name: Run tests
         run: tox -e py38-test-util-http -- -ra
 
-  py38-test-propagator-aws-xray:
-    name: propagator-aws-xray 
+  py38-test-propagator-aws-xray-0:
+    name: propagator-aws-xray-0 
+    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: Checkout core repo @ SHA - ${{ github.sha }}
+        uses: actions/checkout@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - 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
+
+      - name: Run tests
+        run: tox -e py38-test-propagator-aws-xray-0 -- -ra
+
+  py38-test-propagator-aws-xray-1:
+    name: propagator-aws-xray-1 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
@@ -1890,7 +2030,7 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e py38-test-propagator-aws-xray -- -ra
+        run: tox -e py38-test-propagator-aws-xray-1 -- -ra
 
   py38-test-propagator-ot-trace:
     name: propagator-ot-trace 

diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
+  CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
 jobs:

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
+  CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 
 jobs:
@@ -109,6 +109,8 @@ jobs:
   docs:
     name: docs
     runs-on: ubuntu-latest
+    if: |
+      github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4

diff --git a/.github/workflows/prepare-patch-release.yml b/.github/workflows/prepare-patch-release.yml
@@ -8,6 +8,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - run: |
           if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then
             echo this workflow should only be run against long-term release branches

diff --git a/.github/workflows/prepare-release-branch.yml b/.github/workflows/prepare-release-branch.yml
@@ -12,6 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Verify prerequisites
         env:
           PRERELEASE_VERSION: ${{ github.event.inputs.prerelease_version }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,9 @@ jobs:
 
       - uses: actions/checkout@v4
 
+      - name: Install toml
+        run: pip install toml
+
       - name: Set environment variables
         run: |
           stable_version=$(./scripts/eachdist.py version --mode stable)

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -2,13 +2,13 @@
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 version: 2
 
-sphinx:
-  configuration: docs/conf.py
-
 build:
   os: "ubuntu-22.04"
   tools:
     python: "3.8"
+
+sphinx:
+  configuration: docs/conf.py
 
 python:
   install:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix metrics export with exemplar and no context and filtering observable instruments
+  ([#4251](https://github.com/open-telemetry/opentelemetry-python/pull/4251))
+- Fix recursion error with sdk disabled and handler added to root logger
+  ([#4259](https://github.com/open-telemetry/opentelemetry-python/pull/4259))
 - sdk: Add exemplars to the Prometheus exporter
   ([#4178](https://github.com/open-telemetry/opentelemetry-python/pull/4178))