Update core repo sha again

ocelotl · Sep 5, 2024 · 1f3ff04 · 1f3ff04
1 parent 1928519
commit 1f3ff04
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  CORE_REPO_SHA: 67b33673458459ec8edc07d1054db3395afbfaff
+  CORE_REPO_SHA: 04e2d7a14dec5822ba78754b2ee2542797f8fe01
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  CORE_REPO_SHA: 67b33673458459ec8edc07d1054db3395afbfaff
+  CORE_REPO_SHA: 04e2d7a14dec5822ba78754b2ee2542797f8fe01
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 

diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  CORE_REPO_SHA: 67b33673458459ec8edc07d1054db3395afbfaff
+  CORE_REPO_SHA: 04e2d7a14dec5822ba78754b2ee2542797f8fe01
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 

diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
 
 env:
-  CORE_REPO_SHA: 67b33673458459ec8edc07d1054db3395afbfaff
+  CORE_REPO_SHA: 04e2d7a14dec5822ba78754b2ee2542797f8fe01
   CONTRIB_REPO_SHA: main
   PIP_EXISTS_ACTION: w
 

diff --git a/opentelemetry-instrumentation/pyproject.toml b/opentelemetry-instrumentation/pyproject.toml
@@ -27,7 +27,6 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.4",
   "wrapt >= 1.0.0, < 2.0.0",
-  "importlib-metadata >= 6.0, < 8.0",
   "packaging >= 18.0",
 ]
 

diff --git a/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py b/...emetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/__init__.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 from argparse import REMAINDER, ArgumentParser
-from importlib.metadata import entry_points
+from opentelemetry.util._importlib_metadata import entry_points
 from logging import getLogger
 from os import environ, execl, getcwd
 from os.path import abspath, dirname, pathsep

diff --git a/...telemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py b/...telemetry-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/_load.py
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from importlib.metadata import EntryPoint, distributions, entry_points
+from opentelemetry.util._importlib_metadata import (
+    EntryPoint, distributions, entry_points
+)
 from logging import getLogger
 from os import environ
 

diff --git a/tox.ini b/tox.ini
@@ -390,7 +390,7 @@ setenv =
   ; override CORE_REPO_SHA via env variable when testing other branches/commits than main
   ; i.e: CORE_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
   ; CORE_REPO_SHA={env:CORE_REPO_SHA:main}
-  CORE_REPO_SHA=67b33673458459ec8edc07d1054db3395afbfaff
+  CORE_REPO_SHA=04e2d7a14dec5822ba78754b2ee2542797f8fe01
   CORE_REPO=git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}
 
 commands_pre =