From ef79de4a98aea3f71f2328ab632b5e49d87d4ed0 Mon Sep 17 00:00:00 2001
From: Diego Hurtado <ocelotl@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:03:47 -0600
Subject: [PATCH] Fix public-symbols-check

---
 .github/workflows/misc_0.yml           | 16 +++++++----
 .github/workflows/public-api-check.yml | 40 --------------------------
 tox.ini                                |  2 +-
 3 files changed, 12 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/public-api-check.yml

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
index 6562e47cd7a..c0db3816df9 100644
--- a/.github/workflows/misc_0.yml
+++ b/.github/workflows/misc_0.yml
@@ -147,6 +147,17 @@ jobs:
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Checkout main
+        run: git checkout main
+
+      - name: Pull origin
+        run: git pull --rebase=false origin main
+
+      - name: Checkout pull request
+        run: git checkout ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v5
@@ -166,11 +177,6 @@ jobs:
       - 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
 
diff --git a/.github/workflows/public-api-check.yml b/.github/workflows/public-api-check.yml
deleted file mode 100644
index 00c59f94bed..00000000000
--- a/.github/workflows/public-api-check.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Public API check
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-    branches:
-      - main
-
-jobs:
-  publicAPICheck:
-
-    runs-on: ubuntu-latest
-
-    if: "!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')"
-
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Checkout main
-        run: git checkout main
-
-      - name: Pull origin
-        run: git pull --rebase=false origin main
-
-      - name: Checkout pull request
-        run: git checkout ${{ github.event.pull_request.head.sha }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-
-      - name: Install tox
-        run: pip install tox
-
-      - name: Public API Check
-        run: tox -e public-symbols-check
diff --git a/tox.ini b/tox.ini
index 191d89fbef9..f8fe0ce91eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -127,7 +127,7 @@ setenv =
   ; override CONTRIB_REPO_SHA via env variable when testing other branches/commits than main
   ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
   ; CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:main}
-  CONTRIB_REPO_SHA=d90c9d1cbee847d851f37489948db0cf858f3f7d
+  CONTRIB_REPO_SHA=5fc843a63272416a330e43dc02eaaecbd8ff1e4a
   CONTRIB_REPO=git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA}
   mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/opentelemetry-semantic-conventions/src/:{toxinidir}/opentelemetry-sdk/src/:{toxinidir}/tests/opentelemetry-test-utils/src/