opentelemetry-instrumentation 0.53b0__tar.gz → 0.54b0__tar.gz

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentelemetry-instrumentation
-Version: 0.53b0
+Version: 0.54b0
 Summary: Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python
 Project-URL: Homepage, https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation
 Project-URL: Repository, https://github.com/open-telemetry/opentelemetry-python-contrib
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.8
 Requires-Dist: opentelemetry-api~=1.4
-Requires-Dist: opentelemetry-semantic-conventions==0.53b0
+Requires-Dist: opentelemetry-semantic-conventions==0.54b0
 Requires-Dist: packaging>=18.0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Description-Content-Type: text/x-rst

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.4",
-  "opentelemetry-semantic-conventions == 0.53b0",
+  "opentelemetry-semantic-conventions == 0.54b0",
   "wrapt >= 1.0.0, < 2.0.0",
   "packaging >= 18.0",
 ]

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/src/opentelemetry/instrumentation/_semconv.py

@@ -47,6 +47,43 @@ from opentelemetry.semconv.attributes.user_agent_attributes import (
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace.status import Status, StatusCode
 
+# Values defined in milliseconds
+HTTP_DURATION_HISTOGRAM_BUCKETS_OLD = (
+    0.0,
+    5.0,
+    10.0,
+    25.0,
+    50.0,
+    75.0,
+    100.0,
+    250.0,
+    500.0,
+    750.0,
+    1000.0,
+    2500.0,
+    5000.0,
+    7500.0,
+    10000.0,
+)
+
+# Values defined in seconds
+HTTP_DURATION_HISTOGRAM_BUCKETS_NEW = (
+    0.005,
+    0.01,
+    0.025,
+    0.05,
+    0.075,
+    0.1,
+    0.25,
+    0.5,
+    0.75,
+    1,
+    2.5,
+    5,
+    7.5,
+    10,
+)
+
 # These lists represent attributes for metrics that are currently supported
 
 _client_duration_attrs_old = [

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/src/opentelemetry/instrumentation/auto_instrumentation/_load.py

@@ -82,6 +82,14 @@ def _load_instrumentors(distro):
                 exc.conflict,
             )
             continue
+        except ModuleNotFoundError as exc:
+            # ModuleNotFoundError is raised when the library is not installed
+            # and the instrumentation is not required to be loaded.
+            # See https://github.com/open-telemetry/opentelemetry-python-contrib/issues/3421
+            _logger.debug(
+                "Skipping instrumentation %s: %s", entry_point.name, exc.msg
+            )
+            continue
         except ImportError:
             # in scenarios using the kubernetes operator to do autoinstrumentation some
             # instrumentors (usually requiring binary extensions) may fail to load

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -26,199 +26,199 @@ libraries = [
     },
     {
         "library": "aio_pika >= 7.2.0, < 10.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-aio-pika==0.54b0",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.54b0",
     },
     {
         "library": "aiohttp ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-aiohttp-server==0.54b0",
     },
     {
         "library": "aiokafka >= 0.8, < 1.0",
-        "instrumentation": "opentelemetry-instrumentation-aiokafka==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-aiokafka==0.54b0",
     },
     {
         "library": "aiopg >= 0.13.0, < 2.0.0",
-        "instrumentation": "opentelemetry-instrumentation-aiopg==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-aiopg==0.54b0",
     },
     {
         "library": "asgiref ~= 3.0",
-        "instrumentation": "opentelemetry-instrumentation-asgi==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-asgi==0.54b0",
     },
     {
         "library": "asyncclick ~= 8.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncclick==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-asyncclick==0.54b0",
     },
     {
         "library": "asyncpg >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-asyncpg==0.54b0",
     },
     {
         "library": "boto~=2.0",
-        "instrumentation": "opentelemetry-instrumentation-boto==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-boto==0.54b0",
     },
     {
         "library": "boto3 ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-boto3sqs==0.54b0",
     },
     {
         "library": "botocore ~= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-botocore==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-botocore==0.54b0",
     },
     {
         "library": "cassandra-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.54b0",
     },
     {
         "library": "scylla-driver ~= 3.25",
-        "instrumentation": "opentelemetry-instrumentation-cassandra==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-cassandra==0.54b0",
     },
     {
         "library": "celery >= 4.0, < 6.0",
-        "instrumentation": "opentelemetry-instrumentation-celery==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-celery==0.54b0",
     },
     {
         "library": "click >= 8.1.3, < 9.0.0",
-        "instrumentation": "opentelemetry-instrumentation-click==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-click==0.54b0",
     },
     {
         "library": "confluent-kafka >= 1.8.2, <= 2.7.0",
-        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-confluent-kafka==0.54b0",
     },
     {
         "library": "django >= 1.10",
-        "instrumentation": "opentelemetry-instrumentation-django==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-django==0.54b0",
     },
     {
         "library": "elasticsearch >= 6.0",
-        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.54b0",
     },
     {
         "library": "falcon >= 1.4.1, < 5.0.0",
-        "instrumentation": "opentelemetry-instrumentation-falcon==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-falcon==0.54b0",
     },
     {
         "library": "fastapi ~= 0.58",
-        "instrumentation": "opentelemetry-instrumentation-fastapi==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-fastapi==0.54b0",
     },
     {
         "library": "flask >= 1.0",
-        "instrumentation": "opentelemetry-instrumentation-flask==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-flask==0.54b0",
     },
     {
         "library": "grpcio >= 1.42.0",
-        "instrumentation": "opentelemetry-instrumentation-grpc==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-grpc==0.54b0",
     },
     {
         "library": "httpx >= 0.18.0",
-        "instrumentation": "opentelemetry-instrumentation-httpx==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-httpx==0.54b0",
     },
     {
         "library": "jinja2 >= 2.7, < 4.0",
-        "instrumentation": "opentelemetry-instrumentation-jinja2==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-jinja2==0.54b0",
     },
     {
         "library": "kafka-python >= 2.0, < 3.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.54b0",
     },
     {
         "library": "kafka-python-ng >= 2.0, < 3.0",
-        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-kafka-python==0.54b0",
     },
     {
         "library": "mysql-connector-python >= 8.0, < 10.0",
-        "instrumentation": "opentelemetry-instrumentation-mysql==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-mysql==0.54b0",
     },
     {
         "library": "mysqlclient < 3",
-        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-mysqlclient==0.54b0",
     },
     {
         "library": "pika >= 0.12.0",
-        "instrumentation": "opentelemetry-instrumentation-pika==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pika==0.54b0",
     },
     {
         "library": "psycopg >= 3.1.0",
-        "instrumentation": "opentelemetry-instrumentation-psycopg==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg==0.54b0",
     },
     {
         "library": "psycopg2 >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.54b0",
     },
     {
         "library": "psycopg2-binary >= 2.7.3.1",
-        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-psycopg2==0.54b0",
     },
     {
         "library": "pymemcache >= 1.3.5, < 5",
-        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pymemcache==0.54b0",
     },
     {
         "library": "pymongo >= 3.1, < 5.0",
-        "instrumentation": "opentelemetry-instrumentation-pymongo==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pymongo==0.54b0",
     },
     {
         "library": "pymssql >= 2.1.5, < 3",
-        "instrumentation": "opentelemetry-instrumentation-pymssql==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pymssql==0.54b0",
     },
     {
         "library": "PyMySQL < 2",
-        "instrumentation": "opentelemetry-instrumentation-pymysql==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pymysql==0.54b0",
     },
     {
         "library": "pyramid >= 1.7",
-        "instrumentation": "opentelemetry-instrumentation-pyramid==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-pyramid==0.54b0",
     },
     {
         "library": "redis >= 2.6",
-        "instrumentation": "opentelemetry-instrumentation-redis==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-redis==0.54b0",
     },
     {
         "library": "remoulade >= 0.50",
-        "instrumentation": "opentelemetry-instrumentation-remoulade==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-remoulade==0.54b0",
     },
     {
         "library": "requests ~= 2.0",
-        "instrumentation": "opentelemetry-instrumentation-requests==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-requests==0.54b0",
     },
     {
         "library": "sqlalchemy >= 1.0.0, < 2.1.0",
-        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.54b0",
     },
     {
         "library": "starlette >= 0.13, <0.15",
-        "instrumentation": "opentelemetry-instrumentation-starlette==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-starlette==0.54b0",
     },
     {
         "library": "psutil >= 5",
-        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-system-metrics==0.54b0",
     },
     {
         "library": "tornado >= 5.1.1",
-        "instrumentation": "opentelemetry-instrumentation-tornado==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-tornado==0.54b0",
     },
     {
         "library": "tortoise-orm >= 0.17.0",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.54b0",
     },
     {
         "library": "pydantic >= 1.10.2",
-        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.54b0",
     },
     {
         "library": "urllib3 >= 1.0.0, < 3.0.0",
-        "instrumentation": "opentelemetry-instrumentation-urllib3==0.53b0",
+        "instrumentation": "opentelemetry-instrumentation-urllib3==0.54b0",
     },
 ]
 default_instrumentations = [
-    "opentelemetry-instrumentation-asyncio==0.53b0",
-    "opentelemetry-instrumentation-dbapi==0.53b0",
-    "opentelemetry-instrumentation-logging==0.53b0",
-    "opentelemetry-instrumentation-sqlite3==0.53b0",
-    "opentelemetry-instrumentation-threading==0.53b0",
-    "opentelemetry-instrumentation-urllib==0.53b0",
-    "opentelemetry-instrumentation-wsgi==0.53b0",
+    "opentelemetry-instrumentation-asyncio==0.54b0",
+    "opentelemetry-instrumentation-dbapi==0.54b0",
+    "opentelemetry-instrumentation-logging==0.54b0",
+    "opentelemetry-instrumentation-sqlite3==0.54b0",
+    "opentelemetry-instrumentation-threading==0.54b0",
+    "opentelemetry-instrumentation-urllib==0.54b0",
+    "opentelemetry-instrumentation-wsgi==0.54b0",
 ]

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/src/opentelemetry/instrumentation/instrumentor.py

@@ -111,9 +111,12 @@ class BaseInstrumentor(ABC):
         if not skip_dep_check:
             conflict = self._check_dependency_conflicts()
             if conflict:
-                _LOG.error(conflict)
+                # auto-instrumentation path: don't log conflict as error, instead
+                # let _load_instrumentors handle the exception
                 if raise_exception_on_conflict:
                     raise DependencyConflictError(conflict)
+                # manual instrumentation path: log the conflict as error
+                _LOG.error(conflict)
                 return None
 
         # initialize semantic conventions opt-in if needed

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/src/opentelemetry/instrumentation/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.53b0"
+__version__ = "0.54b0"

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/tests/auto_instrumentation/test_load.py

@@ -326,11 +326,12 @@ class TestLoad(TestCase):
             ]
         )
 
+    @patch("opentelemetry.instrumentation.auto_instrumentation._load._logger")
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
     )
     def test_load_instrumentors_import_error_does_not_stop_everything(
-        self, iter_mock
+        self, iter_mock, mock_logger
     ):
         ep_mock1 = Mock(name="instr1")
         ep_mock2 = Mock(name="instr2")
@@ -354,6 +355,12 @@ class TestLoad(TestCase):
             ]
         )
         self.assertEqual(distro_mock.load_instrumentor.call_count, 2)
+        mock_logger.exception.assert_any_call(
+            "Importing of %s failed, skipping it",
+            ep_mock1.name,
+        )
+
+        mock_logger.debug.assert_any_call("Instrumented %s", ep_mock2.name)
 
     @patch(
         "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
@@ -382,6 +389,46 @@ class TestLoad(TestCase):
         )
         self.assertEqual(distro_mock.load_instrumentor.call_count, 1)
 
+    @patch("opentelemetry.instrumentation.auto_instrumentation._load._logger")
+    @patch(
+        "opentelemetry.instrumentation.auto_instrumentation._load.entry_points"
+    )
+    def test_load_instrumentors_module_not_found_error(
+        self, iter_mock, mock_logger
+    ):
+        ep_mock1 = Mock()
+        ep_mock1.name = "instr1"
+
+        ep_mock2 = Mock()
+        ep_mock2.name = "instr2"
+
+        distro_mock = Mock()
+
+        distro_mock.load_instrumentor.side_effect = [
+            ModuleNotFoundError("No module named 'fake_module'"),
+            None,
+        ]
+
+        iter_mock.side_effect = [(), (ep_mock1, ep_mock2), ()]
+
+        _load._load_instrumentors(distro_mock)
+
+        distro_mock.load_instrumentor.assert_has_calls(
+            [
+                call(ep_mock1, raise_exception_on_conflict=True),
+                call(ep_mock2, raise_exception_on_conflict=True),
+            ]
+        )
+        self.assertEqual(distro_mock.load_instrumentor.call_count, 2)
+
+        mock_logger.debug.assert_any_call(
+            "Skipping instrumentation %s: %s",
+            "instr1",
+            "No module named 'fake_module'",
+        )
+
+        mock_logger.debug.assert_any_call("Instrumented %s", ep_mock2.name)
+
     def test_load_instrumentors_no_entry_point_mocks(self):
         distro_mock = Mock()
         _load._load_instrumentors(distro_mock)

{opentelemetry_instrumentation-0.53b0 → opentelemetry_instrumentation-0.54b0}/tests/test_instrumentor.py

@@ -54,11 +54,12 @@ class TestInstrumentor(TestCase):
     def test_singleton(self):
         self.assertIs(self.Instrumentor(), self.Instrumentor())
 
+    @patch("opentelemetry.instrumentation.instrumentor._LOG")
     @patch(
         "opentelemetry.instrumentation.instrumentor.BaseInstrumentor._check_dependency_conflicts"
     )
     def test_instrument_missing_dependency_raise(
-        self, mock__check_dependency_conflicts
+        self, mock__check_dependency_conflicts, mock_logger
     ):
         instrumentor = self.Instrumentor()
 
@@ -71,3 +72,19 @@ class TestInstrumentor(TestCase):
             instrumentor.instrument,
             raise_exception_on_conflict=True,
         )
+        mock_logger.error.assert_not_called()
+
+    @patch("opentelemetry.instrumentation.instrumentor._LOG")
+    @patch(
+        "opentelemetry.instrumentation.instrumentor.BaseInstrumentor._check_dependency_conflicts"
+    )
+    def test_instrument_missing_dependency_log_error(
+        self, mock__check_dependency_conflicts, mock_logger
+    ):
+        instrumentor = self.Instrumentor()
+        conflict = DependencyConflict("missing", "missing")
+        mock__check_dependency_conflicts.return_value = conflict
+        self.assertIsNone(
+            instrumentor.instrument(raise_exception_on_conflict=False)
+        )
+        mock_logger.error.assert_any_call(conflict)