mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-10-12 17:51:11 -04:00
dev-python/opentelemetry-instrumentation: drop 0.64_beta0
Signed-off-by: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
This commit is contained in:
Florian Albrechtskirchinger committed
1 parent
fcd3dd8041
commit
d08b89373f
3 files changed
-184
No files matched your search
@@ -1,6 +1,4 @@
|
||||
DIST opentelemetry-python-1.43.0.gh.tar.gz 1601072 BLAKE2B 9ea017308ecc0e3d4b00b86bf384c8737341babe5690defd33f0455af248052a4492bcaa793ea5a2bdc7a2d1cc27a708631651b232bda788fb535a7581bf844a SHA512 ec8b5862f9bc8aaa60ff765cbdf72ce488ea8b04efa49549901d73b909f5f66a187e8e345ac8b085fdff03207787539ff6a6f75ceb8fdbc056a5de5c3c3619ab
|
||||
DIST opentelemetry-python-1.44.0.gh.tar.gz 1651335 BLAKE2B 9b1e6b9dbabaeccfc1e9fc267de0c882c78816abdec6d5344deccecca2c6d41736e1eb2fa7b5d85ed2e0047fa8fe23db1f4d2ae8e561f9c44ea1413754dde7f9 SHA512 310fa4d7b11aa6a4cfb498294e3c71e082e8fe2a9899c855f0968eb0b6eff91fc66921a0dad3b2075944a6f21b8802aea7d58baefd916f7909f1dae30bc7ad61
|
||||
DIST opentelemetry-python-1.45.0.gh.tar.gz 1715368 BLAKE2B 6a70a94f38df7b038eca1cf815ca93deaf58c94aac0996a24d08a0f9243651dd1e0c8c4f7daf9b1bc6274677ed1519fa0e9e72243fe266765a43fc6d50a4301a SHA512 c05f1fd1f6b2f8de830d2d2bdbaac01c47aa0b4615091f6fd78c39ef7e4aba10c2bd23ef4906e5b9e4ab46b2e55f8321f917c900bb930988d1cdfc85e9a77527
|
||||
DIST opentelemetry-python-contrib-0.64b0.gh.tar.gz 1983357 BLAKE2B 5889183d317ac2afcbb44f6df7ffabf20094b9fb56aa8f2c578b6fa66b76ded2cf63b0488594719cc231997e9d6b6d042fd7d83df8f192b9904367e65c623333 SHA512 78bc185a0d41c0dfd261d6cc4204e98c09b1bc8598cbab77890f559c5a84fdfacc95952c1358790f2b588540b60016f7ffea6d80b398e07d73af888e4c4bbfa9
|
||||
DIST opentelemetry-python-contrib-0.65b0.gh.tar.gz 2031667 BLAKE2B 2e932229b81d9958fd6941c90315977c9d28b4652a8ec1b1b32bda064b70d059611a0a2142ec63739eebaed92ee7744f8fbba38a251aed7f16451f8180831fa4 SHA512 0086da20862b5be310594313e59927e508fbbfe36a3dee1ef8759f44b37ac8b2e7dbd31c1d27bd44a86a413c7aa8ec6a0c24ca31584433913fdd4b83fd089693
|
||||
DIST opentelemetry-python-contrib-0.66b0.gh.tar.gz 1875879 BLAKE2B e92e5d89674197cbed378c3c48eb78bbfc87cd6f0ab97881b0f990c5fa5294d94aea49953e9db384a3c6b4853c0cb3a3f8d3f16a49dc6e3eec426837ed4cdc28 SHA512 58da31c4cda5c0464f3dcd3ec99b97575a7742ec7e419a88279cb1ba830041659118e9d62a8e6d22205bbd2c7b8130859babe5faa626ec107b61c9130b79c087
|
||||
-123
@@ -1,123 +0,0 @@
|
||||
index e38932e28..37e6c674f 100644
|
||||
--- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py
|
||||
+++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/utils.py
|
||||
@@ -20,7 +20,11 @@ from importlib import import_module
|
||||
from re import escape, sub
|
||||
from typing import Any, Dict, Generator, Sequence
|
||||
|
||||
-from wrapt import ObjectProxy
|
||||
+try:
|
||||
+ # wrapt 2.0.0+
|
||||
+ from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
|
||||
+except ImportError:
|
||||
+ from wrapt import ObjectProxy as BaseObjectProxy
|
||||
|
||||
from opentelemetry import context, trace
|
||||
|
||||
@@ -108,7 +112,11 @@ def unwrap(obj: object, attr: str):
|
||||
) from exc
|
||||
|
||||
func = getattr(obj, attr, None)
|
||||
- if func and isinstance(func, ObjectProxy) and hasattr(func, "__wrapped__"):
|
||||
+ if (
|
||||
+ func
|
||||
+ and isinstance(func, BaseObjectProxy)
|
||||
+ and hasattr(func, "__wrapped__")
|
||||
+ ):
|
||||
setattr(obj, attr, func.__wrapped__)
|
||||
|
||||
|
||||
diff --git a/opentelemetry-instrumentation/tests/test_utils.py b/opentelemetry-instrumentation/tests/test_utils.py
|
||||
index 5ddd45d69..11a3598bd 100644
|
||||
--- a/opentelemetry-instrumentation/tests/test_utils.py
|
||||
+++ b/opentelemetry-instrumentation/tests/test_utils.py
|
||||
@@ -15,7 +15,13 @@
|
||||
import unittest
|
||||
from http import HTTPStatus
|
||||
|
||||
-from wrapt import ObjectProxy, wrap_function_wrapper
|
||||
+from wrapt import wrap_function_wrapper
|
||||
+
|
||||
+try:
|
||||
+ # wrapt 2.0.0+
|
||||
+ from wrapt import BaseObjectProxy # pylint: disable=no-name-in-module
|
||||
+except ImportError:
|
||||
+ from wrapt import ObjectProxy as BaseObjectProxy
|
||||
|
||||
from opentelemetry.context import (
|
||||
_SUPPRESS_HTTP_INSTRUMENTATION_KEY,
|
||||
@@ -263,23 +269,23 @@ class UnwrapTestCase(unittest.TestCase):
|
||||
def test_can_unwrap_object_attribute(self):
|
||||
self._wrap_method()
|
||||
instance = WrappedClass()
|
||||
- self.assertTrue(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertTrue(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
unwrap(WrappedClass, "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
def test_can_unwrap_object_attribute_as_string(self):
|
||||
self._wrap_method()
|
||||
instance = WrappedClass()
|
||||
- self.assertTrue(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertTrue(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
unwrap("tests.test_utils.WrappedClass", "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
def test_raises_import_error_if_path_not_well_formed(self):
|
||||
self._wrap_method()
|
||||
instance = WrappedClass()
|
||||
- self.assertTrue(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertTrue(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
with self.assertRaisesRegex(
|
||||
ImportError, "Cannot parse '' as dotted import path"
|
||||
@@ -287,23 +293,23 @@ class UnwrapTestCase(unittest.TestCase):
|
||||
unwrap("", "method")
|
||||
|
||||
unwrap(WrappedClass, "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
def test_raises_import_error_if_cannot_find_module(self):
|
||||
self._wrap_method()
|
||||
instance = WrappedClass()
|
||||
- self.assertTrue(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertTrue(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
with self.assertRaisesRegex(ImportError, "No module named 'does'"):
|
||||
unwrap("does.not.exist.WrappedClass", "method")
|
||||
|
||||
unwrap(WrappedClass, "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
def test_raises_import_error_if_cannot_find_object(self):
|
||||
self._wrap_method()
|
||||
instance = WrappedClass()
|
||||
- self.assertTrue(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertTrue(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
with self.assertRaisesRegex(
|
||||
ImportError, "Cannot import 'NotWrappedClass' from"
|
||||
@@ -311,7 +317,7 @@ class UnwrapTestCase(unittest.TestCase):
|
||||
unwrap("tests.test_utils.NotWrappedClass", "method")
|
||||
|
||||
unwrap(WrappedClass, "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
|
||||
# pylint: disable=no-self-use
|
||||
def test_does_nothing_if_cannot_find_attribute(self):
|
||||
@@ -320,6 +326,6 @@ class UnwrapTestCase(unittest.TestCase):
|
||||
|
||||
def test_does_nothing_if_attribute_is_not_from_wrapt(self):
|
||||
instance = WrappedClass()
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
unwrap(WrappedClass, "method")
|
||||
- self.assertFalse(isinstance(instance.method, ObjectProxy))
|
||||
+ self.assertFalse(isinstance(instance.method, BaseObjectProxy))
|
||||
-59
@@ -1,59 +0,0 @@
|
||||
# Copyright 2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=hatchling
|
||||
PYTHON_COMPAT=( python3_{12..15} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
MY_PV=${PV/_beta/b}
|
||||
MY_P="opentelemetry-python-contrib-${MY_PV}"
|
||||
|
||||
OTLP_PV=1.43.0
|
||||
OTLP_P="opentelemetry-python-${OTLP_PV}"
|
||||
|
||||
DESCRIPTION="Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"
|
||||
HOMEPAGE="
|
||||
https://opentelemetry.io/
|
||||
https://pypi.org/project/opentelemetry-instrumentation/
|
||||
https://github.com/open-telemetry/opentelemetry-python-contrib/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/open-telemetry/opentelemetry-python-contrib/archive/refs/tags/v${MY_PV}.tar.gz
|
||||
-> ${MY_P}.gh.tar.gz
|
||||
test? (
|
||||
https://github.com/open-telemetry/opentelemetry-python/archive/refs/tags/v${OTLP_PV}.tar.gz
|
||||
-> ${OTLP_P}.gh.tar.gz
|
||||
)
|
||||
"
|
||||
S="${WORKDIR}/${MY_P}/${PN}"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
~dev-python/opentelemetry-api-${OTLP_PV}[${PYTHON_USEDEP}]
|
||||
~dev-python/opentelemetry-sdk-${OTLP_PV}[${PYTHON_USEDEP}]
|
||||
~dev-python/opentelemetry-semantic-conventions-${OTLP_PV}[${PYTHON_USEDEP}]
|
||||
>=dev-python/packaging-18.0[${PYTHON_USEDEP}]
|
||||
>=dev-python/wrapt-1.0.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
EPYTEST_PLUGINS=()
|
||||
distutils_enable_tests pytest
|
||||
|
||||
python_test() {
|
||||
cp -a "${BUILD_DIR}"/{install,test} || die
|
||||
local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
|
||||
|
||||
for dep in tests/opentelemetry-test-utils; do
|
||||
pushd "${WORKDIR}/${OTLP_P}/${dep}" >/dev/null || die
|
||||
distutils_pep517_install "${BUILD_DIR}"/test
|
||||
popd >/dev/null || die
|
||||
done
|
||||
|
||||
epytest
|
||||
}
|
||||
Reference in new issue
Block a user