opentelemetry-instrumentation 0.56b0__py3-none-any.whl → 0.58b0__py3-none-any.whl

opentelemetry/instrumentation/_semconv.py

@@ -17,6 +17,24 @@ import threading
 from enum import Enum
 
 from opentelemetry.instrumentation.utils import http_status_to_status_code
+from opentelemetry.semconv._incubating.attributes.http_attributes import (
+    HTTP_FLAVOR,
+    HTTP_HOST,
+    HTTP_METHOD,
+    HTTP_SCHEME,
+    HTTP_SERVER_NAME,
+    HTTP_STATUS_CODE,
+    HTTP_TARGET,
+    HTTP_URL,
+    HTTP_USER_AGENT,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
+    NET_HOST_NAME,
+    NET_HOST_PORT,
+    NET_PEER_IP,
+    NET_PEER_NAME,
+    NET_PEER_PORT,
+)
 from opentelemetry.semconv.attributes.client_attributes import (
     CLIENT_ADDRESS,
     CLIENT_PORT,
@@ -44,7 +62,7 @@ from opentelemetry.semconv.attributes.url_attributes import (
 from opentelemetry.semconv.attributes.user_agent_attributes import (
     USER_AGENT_ORIGINAL,
 )
-from opentelemetry.semconv.trace import SpanAttributes
+from opentelemetry.semconv.schemas import Schemas
 from opentelemetry.trace.status import Status, StatusCode
 
 # Values defined in milliseconds
@@ -87,13 +105,13 @@ HTTP_DURATION_HISTOGRAM_BUCKETS_NEW = (
 # These lists represent attributes for metrics that are currently supported
 
 _client_duration_attrs_old = [
-    SpanAttributes.HTTP_STATUS_CODE,
-    SpanAttributes.HTTP_HOST,
-    SpanAttributes.NET_PEER_PORT,
-    SpanAttributes.NET_PEER_NAME,
-    SpanAttributes.HTTP_METHOD,
-    SpanAttributes.HTTP_FLAVOR,
-    SpanAttributes.HTTP_SCHEME,
+    HTTP_STATUS_CODE,
+    HTTP_HOST,
+    HTTP_METHOD,
+    HTTP_FLAVOR,
+    HTTP_SCHEME,
+    NET_PEER_PORT,
+    NET_PEER_NAME,
 ]
 
 _client_duration_attrs_new = [
@@ -108,14 +126,14 @@ _client_duration_attrs_new = [
 ]
 
 _server_duration_attrs_old = [
-    SpanAttributes.HTTP_METHOD,
-    SpanAttributes.HTTP_HOST,
-    SpanAttributes.HTTP_SCHEME,
-    SpanAttributes.HTTP_STATUS_CODE,
-    SpanAttributes.HTTP_FLAVOR,
-    SpanAttributes.HTTP_SERVER_NAME,
-    SpanAttributes.NET_HOST_NAME,
-    SpanAttributes.NET_HOST_PORT,
+    HTTP_METHOD,
+    HTTP_HOST,
+    HTTP_SCHEME,
+    HTTP_STATUS_CODE,
+    HTTP_FLAVOR,
+    HTTP_SERVER_NAME,
+    NET_HOST_NAME,
+    NET_HOST_PORT,
 ]
 
 _server_duration_attrs_new = [
@@ -128,11 +146,11 @@ _server_duration_attrs_new = [
 ]
 
 _server_active_requests_count_attrs_old = [
-    SpanAttributes.HTTP_METHOD,
-    SpanAttributes.HTTP_HOST,
-    SpanAttributes.HTTP_SCHEME,
-    SpanAttributes.HTTP_FLAVOR,
-    SpanAttributes.HTTP_SERVER_NAME,
+    HTTP_METHOD,
+    HTTP_HOST,
+    HTTP_SCHEME,
+    HTTP_FLAVOR,
+    HTTP_SERVER_NAME,
 ]
 
 _server_active_requests_count_attrs_new = [
@@ -144,9 +162,10 @@ _server_active_requests_count_attrs_new = [
 OTEL_SEMCONV_STABILITY_OPT_IN = "OTEL_SEMCONV_STABILITY_OPT_IN"
 
 
-class _OpenTelemetryStabilitySignalType:
+class _OpenTelemetryStabilitySignalType(Enum):
     HTTP = "http"
     DATABASE = "database"
+    GEN_AI = "gen_ai"
 
 
 class _StabilityMode(Enum):
@@ -155,6 +174,7 @@ class _StabilityMode(Enum):
     HTTP_DUP = "http/dup"
     DATABASE = "database"
     DATABASE_DUP = "database/dup"
+    GEN_AI_LATEST_EXPERIMENTAL = "gen_ai_latest_experimental"
 
 
 def _report_new(mode: _StabilityMode):
@@ -177,7 +197,7 @@ class _OpenTelemetrySemanticConventionStability:
                 return
 
             # Users can pass in comma delimited string for opt-in options
-            # Only values for http and database stability are supported for now
+            # Only values for http, gen ai, and database stability are supported for now
             opt_in = os.environ.get(OTEL_SEMCONV_STABILITY_OPT_IN)
 
             if not opt_in:
@@ -185,6 +205,7 @@ class _OpenTelemetrySemanticConventionStability:
                 cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING = {
                     _OpenTelemetryStabilitySignalType.HTTP: _StabilityMode.DEFAULT,
                     _OpenTelemetryStabilitySignalType.DATABASE: _StabilityMode.DEFAULT,
+                    _OpenTelemetryStabilitySignalType.GEN_AI: _StabilityMode.DEFAULT,
                 }
                 cls._initialized = True
                 return
@@ -197,6 +218,14 @@ class _OpenTelemetrySemanticConventionStability:
                 opt_in_list, _StabilityMode.HTTP, _StabilityMode.HTTP_DUP
             )
 
+            cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
+                _OpenTelemetryStabilitySignalType.GEN_AI
+            ] = cls._filter_mode(
+                opt_in_list,
+                _StabilityMode.DEFAULT,
+                _StabilityMode.GEN_AI_LATEST_EXPERIMENTAL,
+            )
+
             cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
                 _OpenTelemetryStabilitySignalType.DATABASE
             ] = cls._filter_mode(
@@ -204,7 +233,6 @@ class _OpenTelemetrySemanticConventionStability:
                 _StabilityMode.DATABASE,
                 _StabilityMode.DATABASE_DUP,
             )
-
             cls._initialized = True
 
     @staticmethod
@@ -287,44 +315,42 @@ def _set_http_method(result, original, normalized, sem_conv_opt_in_mode):
         set_string_attribute(result, HTTP_REQUEST_METHOD_ORIGINAL, original)
 
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_METHOD, normalized)
+        set_string_attribute(result, HTTP_METHOD, normalized)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, HTTP_REQUEST_METHOD, normalized)
 
 
 def _set_http_status_code(result, code, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_int_attribute(result, SpanAttributes.HTTP_STATUS_CODE, code)
+        set_int_attribute(result, HTTP_STATUS_CODE, code)
     if _report_new(sem_conv_opt_in_mode):
         set_int_attribute(result, HTTP_RESPONSE_STATUS_CODE, code)
 
 
 def _set_http_url(result, url, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_URL, url)
+        set_string_attribute(result, HTTP_URL, url)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, URL_FULL, url)
 
 
 def _set_http_scheme(result, scheme, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_SCHEME, scheme)
+        set_string_attribute(result, HTTP_SCHEME, scheme)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, URL_SCHEME, scheme)
 
 
 def _set_http_flavor_version(result, version, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_FLAVOR, version)
+        set_string_attribute(result, HTTP_FLAVOR, version)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, NETWORK_PROTOCOL_VERSION, version)
 
 
 def _set_http_user_agent(result, user_agent, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(
-            result, SpanAttributes.HTTP_USER_AGENT, user_agent
-        )
+        set_string_attribute(result, HTTP_USER_AGENT, user_agent)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, USER_AGENT_ORIGINAL, user_agent)
 
@@ -334,28 +360,28 @@ def _set_http_user_agent(result, user_agent, sem_conv_opt_in_mode):
 
 def _set_http_host_client(result, host, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
+        set_string_attribute(result, HTTP_HOST, host)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, SERVER_ADDRESS, host)
 
 
 def _set_http_net_peer_name_client(result, peer_name, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.NET_PEER_NAME, peer_name)
+        set_string_attribute(result, NET_PEER_NAME, peer_name)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, SERVER_ADDRESS, peer_name)
 
 
 def _set_http_peer_port_client(result, port, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_int_attribute(result, SpanAttributes.NET_PEER_PORT, port)
+        set_int_attribute(result, NET_PEER_PORT, port)
     if _report_new(sem_conv_opt_in_mode):
         set_int_attribute(result, SERVER_PORT, port)
 
 
 def _set_http_network_protocol_version(result, version, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_FLAVOR, version)
+        set_string_attribute(result, HTTP_FLAVOR, version)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, NETWORK_PROTOCOL_VERSION, version)
 
@@ -365,21 +391,21 @@ def _set_http_network_protocol_version(result, version, sem_conv_opt_in_mode):
 
 def _set_http_net_host(result, host, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.NET_HOST_NAME, host)
+        set_string_attribute(result, NET_HOST_NAME, host)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, SERVER_ADDRESS, host)
 
 
 def _set_http_net_host_port(result, port, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_int_attribute(result, SpanAttributes.NET_HOST_PORT, port)
+        set_int_attribute(result, NET_HOST_PORT, port)
     if _report_new(sem_conv_opt_in_mode):
         set_int_attribute(result, SERVER_PORT, port)
 
 
 def _set_http_target(result, target, path, query, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_TARGET, target)
+        set_string_attribute(result, HTTP_TARGET, target)
     if _report_new(sem_conv_opt_in_mode):
         if path:
             set_string_attribute(result, URL_PATH, path)
@@ -389,7 +415,7 @@ def _set_http_target(result, target, path, query, sem_conv_opt_in_mode):
 
 def _set_http_host_server(result, host, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.HTTP_HOST, host)
+        set_string_attribute(result, HTTP_HOST, host)
     if _report_new(sem_conv_opt_in_mode):
         if not result.get(SERVER_ADDRESS):
             set_string_attribute(result, SERVER_ADDRESS, host)
@@ -402,7 +428,7 @@ def _set_http_host_server(result, host, sem_conv_opt_in_mode):
 # https://github.com/open-telemetry/semantic-conventions/blob/main/docs/non-normative/http-migration.md#common-attributes-across-http-client-and-server-spans
 def _set_http_peer_ip_server(result, ip, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.NET_PEER_IP, ip)
+        set_string_attribute(result, NET_PEER_IP, ip)
     if _report_new(sem_conv_opt_in_mode):
         # Only populate if not already populated
         if not result.get(CLIENT_ADDRESS):
@@ -411,14 +437,14 @@ def _set_http_peer_ip_server(result, ip, sem_conv_opt_in_mode):
 
 def _set_http_peer_port_server(result, port, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_int_attribute(result, SpanAttributes.NET_PEER_PORT, port)
+        set_int_attribute(result, NET_PEER_PORT, port)
     if _report_new(sem_conv_opt_in_mode):
         set_int_attribute(result, CLIENT_PORT, port)
 
 
 def _set_http_net_peer_name_server(result, name, sem_conv_opt_in_mode):
     if _report_old(sem_conv_opt_in_mode):
-        set_string_attribute(result, SpanAttributes.NET_PEER_NAME, name)
+        set_string_attribute(result, NET_PEER_NAME, name)
     if _report_new(sem_conv_opt_in_mode):
         set_string_attribute(result, CLIENT_ADDRESS, name)
 
@@ -450,10 +476,8 @@ def _set_status(
 
         if _report_old(sem_conv_opt_in_mode):
             if span.is_recording():
-                span.set_attribute(
-                    SpanAttributes.HTTP_STATUS_CODE, status_code
-                )
-            metrics_attributes[SpanAttributes.HTTP_STATUS_CODE] = status_code
+                span.set_attribute(HTTP_STATUS_CODE, status_code)
+            metrics_attributes[HTTP_STATUS_CODE] = status_code
         if _report_new(sem_conv_opt_in_mode):
             if span.is_recording():
                 span.set_attribute(HTTP_RESPONSE_STATUS_CODE, status_code)
@@ -470,4 +494,4 @@ def _set_status(
 def _get_schema_url(mode: _StabilityMode) -> str:
     if mode is _StabilityMode.DEFAULT:
         return "https://opentelemetry.io/schemas/1.11.0"
-    return SpanAttributes.SCHEMA_URL
+    return Schemas.V1_21_0.value

opentelemetry/instrumentation/auto_instrumentation/__init__.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from argparse import REMAINDER, ArgumentParser
 from logging import getLogger
 from os import environ, execl, getcwd
@@ -24,6 +26,9 @@ from opentelemetry.instrumentation.auto_instrumentation._load import (
     _load_distro,
     _load_instrumentors,
 )
+from opentelemetry.instrumentation.environment_variables import (
+    OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH,
+)
 from opentelemetry.instrumentation.utils import _python_path_without_directory
 from opentelemetry.instrumentation.version import __version__
 from opentelemetry.util._importlib_metadata import entry_points
@@ -130,6 +135,30 @@ def initialize(*, swallow_exceptions: bool = True) -> None:
             environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep
         )
 
+    # handle optional gevent monkey patching. This is done via environment variables so it may be used from the
+    # opentelemetry operator
+    gevent_patch: str | None = environ.get(
+        OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH
+    )
+    if gevent_patch is not None:
+        if gevent_patch != "patch_all":
+            _logger.error(
+                "%s value must be `patch_all`",
+                OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH,
+            )
+        else:
+            try:
+                # pylint: disable=import-outside-toplevel
+                from gevent import monkey
+
+                getattr(monkey, gevent_patch)()
+            except ImportError:
+                _logger.exception(
+                    "Failed to monkey patch with gevent because gevent is not available"
+                )
+                if not swallow_exceptions:
+                    raise
+
     try:
         distro = _load_distro()
         distro.configure()

opentelemetry/instrumentation/auto_instrumentation/_load.py

@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from functools import cached_property
 from logging import getLogger
 from os import environ
 
-from opentelemetry.instrumentation.dependencies import DependencyConflictError
+from opentelemetry.instrumentation.dependencies import (
+    DependencyConflictError,
+    get_dist_dependency_conflicts,
+)
 from opentelemetry.instrumentation.distro import BaseDistro, DefaultDistro
 from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_CONFIGURATOR,
@@ -23,11 +27,36 @@ from opentelemetry.instrumentation.environment_variables import (
     OTEL_PYTHON_DISTRO,
 )
 from opentelemetry.instrumentation.version import __version__
-from opentelemetry.util._importlib_metadata import entry_points
+from opentelemetry.util._importlib_metadata import (
+    EntryPoint,
+    distributions,
+    entry_points,
+)
 
 _logger = getLogger(__name__)
 
 
+class _EntryPointDistFinder:
+    @cached_property
+    def _mapping(self):
+        return {
+            self._key_for(ep): dist
+            for dist in distributions()
+            for ep in dist.entry_points
+        }
+
+    def dist_for(self, entry_point: EntryPoint):
+        dist = getattr(entry_point, "dist", None)
+        if dist:
+            return dist
+
+        return self._mapping.get(self._key_for(entry_point))
+
+    @staticmethod
+    def _key_for(entry_point: EntryPoint):
+        return f"{entry_point.group}:{entry_point.name}:{entry_point.value}"
+
+
 def _load_distro() -> BaseDistro:
     distro_name = environ.get(OTEL_PYTHON_DISTRO, None)
     for entry_point in entry_points(group="opentelemetry_distro"):
@@ -55,6 +84,7 @@ def _load_distro() -> BaseDistro:
 
 def _load_instrumentors(distro):
     package_to_exclude = environ.get(OTEL_PYTHON_DISABLED_INSTRUMENTATIONS, [])
+    entry_point_finder = _EntryPointDistFinder()
     if isinstance(package_to_exclude, str):
         package_to_exclude = package_to_exclude.split(",")
         # to handle users entering "requests , flask" or "requests, flask" with spaces
@@ -71,11 +101,24 @@ def _load_instrumentors(distro):
             continue
 
         try:
-            distro.load_instrumentor(
-                entry_point, raise_exception_on_conflict=True
-            )
+            entry_point_dist = entry_point_finder.dist_for(entry_point)
+            conflict = get_dist_dependency_conflicts(entry_point_dist)
+            if conflict:
+                _logger.debug(
+                    "Skipping instrumentation %s: %s",
+                    entry_point.name,
+                    conflict,
+                )
+                continue
+
+            # tell instrumentation to not run dep checks again as we already did it above
+            distro.load_instrumentor(entry_point, skip_dep_check=True)
             _logger.debug("Instrumented %s", entry_point.name)
         except DependencyConflictError as exc:
+            # Dependency conflicts are generally caught from get_dist_dependency_conflicts
+            # returning a DependencyConflict. Keeping this error handling in case custom
+            # distro and instrumentor behavior raises a DependencyConflictError later.
+            # See https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3610
             _logger.debug(
                 "Skipping instrumentation %s: %s",
                 entry_point.name,

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

opentelemetry/instrumentation/dependencies.py

@@ -20,6 +20,7 @@ from typing import Collection
 from packaging.requirements import InvalidRequirement, Requirement
 
 from opentelemetry.util._importlib_metadata import (
+    Distribution,
     PackageNotFoundError,
     version,
 )
@@ -28,14 +29,44 @@ logger = getLogger(__name__)
 
 
 class DependencyConflict:
+    """Represents a dependency conflict in OpenTelemetry instrumentation.
+
+    This class is used to track conflicts between required dependencies and the
+    actual installed packages. It supports two scenarios:
+
+    1. Standard conflicts where all dependencies are required
+    2. Either/or conflicts where only one of a set of dependencies is required
+
+    Attributes:
+        required: The required dependency specification that conflicts with what's installed.
+        found: The actual dependency that was found installed (if any).
+        required_any: Collection of dependency specifications where any one would satisfy
+            the requirement (for either/or scenarios).
+        found_any: Collection of actual dependencies found for either/or scenarios.
+    """
+
     required: str | None = None
     found: str | None = None
-
-    def __init__(self, required: str | None, found: str | None = None):
+    # The following fields are used when an instrumentation requires any of a set of dependencies rather than all.
+    required_any: Collection[str] = None
+    found_any: Collection[str] = None
+
+    def __init__(
+        self,
+        required: str | None = None,
+        found: str | None = None,
+        required_any: Collection[str] = None,
+        found_any: Collection[str] = None,
+    ):
         self.required = required
         self.found = found
+        # The following fields are used when an instrumentation requires any of a set of dependencies rather than all.
+        self.required_any = required_any
+        self.found_any = found_any
 
     def __str__(self):
+        if not self.required and (self.required_any or self.found_any):
+            return f'DependencyConflict: requested any of the following: "{self.required_any}" but found: "{self.found_any}"'
         return f'DependencyConflict: requested: "{self.required}" but found: "{self.found}"'
 
 
@@ -49,8 +80,39 @@ class DependencyConflictError(Exception):
         return str(self.conflict)
 
 
+def get_dist_dependency_conflicts(
+    dist: Distribution,
+) -> DependencyConflict | None:
+    instrumentation_deps = []
+    instrumentation_any_deps = []
+    extra = "extra"
+    instruments = "instruments"
+    instruments_marker = {extra: instruments}
+    instruments_any = "instruments-any"
+    instruments_any_marker = {extra: instruments_any}
+    if dist.requires:
+        for dep in dist.requires:
+            if extra not in dep:
+                continue
+            if instruments not in dep and instruments_any not in dep:
+                continue
+
+            req = Requirement(dep)
+            if req.marker.evaluate(instruments_marker):  # type: ignore
+                instrumentation_deps.append(req)  # type: ignore
+            if req.marker.evaluate(instruments_any_marker):  # type: ignore
+                instrumentation_any_deps.append(req)  # type: ignore
+    return get_dependency_conflicts(
+        instrumentation_deps, instrumentation_any_deps
+    )  # type: ignore
+
+
 def get_dependency_conflicts(
-    deps: Collection[str | Requirement],
+    deps: Collection[
+        str | Requirement
+    ],  # Dependencies all of which are required
+    deps_any: Collection[str | Requirement]
+    | None = None,  # Dependencies any of which are required
 ) -> DependencyConflict | None:
     for dep in deps:
         if isinstance(dep, Requirement):
@@ -73,4 +135,53 @@ def get_dependency_conflicts(
 
         if not req.specifier.contains(dist_version):
             return DependencyConflict(dep, f"{req.name} {dist_version}")
+
+    # If all the dependencies in "instruments" are present, check "instruments-any" for conflicts.
+    if deps_any:
+        return _get_dependency_conflicts_any(deps_any)
+    return None
+
+
+# This is a helper functions designed to ease reading and meet linting requirements.
+def _get_dependency_conflicts_any(
+    deps_any: Collection[str | Requirement],
+) -> DependencyConflict | None:
+    if not deps_any:
+        return None
+    is_dependency_conflict = True
+    required_any: Collection[str] = []
+    found_any: Collection[str] = []
+    for dep in deps_any:
+        if isinstance(dep, Requirement):
+            req = dep
+        else:
+            try:
+                req = Requirement(dep)
+            except InvalidRequirement as exc:
+                logger.warning(
+                    'error parsing dependency, reporting as a conflict: "%s" - %s',
+                    dep,
+                    exc,
+                )
+                return DependencyConflict(dep)
+
+        try:
+            dist_version = version(req.name)
+        except PackageNotFoundError:
+            required_any.append(str(dep))
+            continue
+
+        if req.specifier.contains(dist_version):
+            # Since only one of the instrumentation_any dependencies is required, there is no dependency conflict.
+            is_dependency_conflict = False
+            break
+        # If the version does not match, add it to the list of unfulfilled requirement options.
+        required_any.append(str(dep))
+        found_any.append(f"{req.name} {dist_version}")
+
+    if is_dependency_conflict:
+        return DependencyConflict(
+            required_any=required_any,
+            found_any=found_any,
+        )
     return None

opentelemetry/instrumentation/environment_variables.py

@@ -26,3 +26,10 @@ OTEL_PYTHON_CONFIGURATOR = "OTEL_PYTHON_CONFIGURATOR"
 """
 .. envvar:: OTEL_PYTHON_CONFIGURATOR
 """
+
+OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH = (
+    "OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH"
+)
+"""
+.. envvar:: OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH
+"""

opentelemetry/instrumentation/utils.py

@@ -207,7 +207,8 @@ def _suppress_instrumentation(*keys: str) -> Generator[None]:
     try:
         yield
     finally:
-        context.detach(token)
+        if token:
+            context.detach(token)
 
 
 @contextmanager

opentelemetry/instrumentation/version.py

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

{opentelemetry_instrumentation-0.56b0.dist-info → opentelemetry_instrumentation-0.58b0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opentelemetry-instrumentation
-Version: 0.56b0
+Version: 0.58b0
 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
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.9
 Requires-Dist: opentelemetry-api~=1.4
-Requires-Dist: opentelemetry-semantic-conventions==0.56b0
+Requires-Dist: opentelemetry-semantic-conventions==0.58b0
 Requires-Dist: packaging>=18.0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Description-Content-Type: text/x-rst
@@ -130,7 +130,13 @@ check `here <https://opentelemetry-python.readthedocs.io/en/stable/index.html#in
 * ``OTEL_PYTHON_DISABLED_INSTRUMENTATIONS``
 
 If set by the user, opentelemetry-instrument will read this environment variable to disable specific instrumentations.
-e.g OTEL_PYTHON_DISABLED_INSTRUMENTATIONS = "requests,django"
+e.g OTEL_PYTHON_DISABLED_INSTRUMENTATIONS="requests,django"
+
+* ``OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH``
+
+If set by the user to `patch_all` , opentelemetry instrument will call the gevent monkeypatching method ``patch_all``.
+This is considered experimental but can be useful to instrument gevent applications.
+e.g OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH=patch_all
 
 
 Examples

opentelemetry_instrumentation-0.58b0.dist-info/RECORD

@@ -0,0 +1,20 @@
+opentelemetry/instrumentation/_semconv.py,sha256=YVYiDrJYGPb8MXwkS5dpZZJuB6h_wbHfTBHVXtENX5w,15629
+opentelemetry/instrumentation/bootstrap.py,sha256=Q-1j1G7QKXTTvH5xGGGRX3jCpTf_NuhBoy2X_MvM9sg,5428
+opentelemetry/instrumentation/bootstrap_gen.py,sha256=LnZvsB614mRh8igBB2SGX1_iQW9O3VAKjRLIbf1LqiM,7630
+opentelemetry/instrumentation/dependencies.py,sha256=4KBJH2u_IHKLvyBHyJENJgNjCapzN-i32RMb2ibTJ88,6608
+opentelemetry/instrumentation/distro.py,sha256=l7wjM9eR44X-Bk6w-b3_kW3_QgW82OiITRTOY48shZk,2168
+opentelemetry/instrumentation/environment_variables.py,sha256=h5MwryhuftyZUCW9XrUXegC9CHfLSvpcB_mmKnMZVDc,1115
+opentelemetry/instrumentation/instrumentor.py,sha256=5nKN5yGZHOiNoiMBbbB_QOdjayyBAx3PP1C8KpUWRiY,5022
+opentelemetry/instrumentation/propagators.py,sha256=hBkG70KlMUiTjxPeiyOhkb_eE96DRVzRyY4fEIzMqD4,4070
+opentelemetry/instrumentation/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+opentelemetry/instrumentation/sqlcommenter_utils.py,sha256=oh97wDXsXvU8GdxGRpWGxcneAz5_dwTBa1U-OVp0zMU,1963
+opentelemetry/instrumentation/utils.py,sha256=6GxH-zAKa0oj7V2lIuwd8p0TmMA2SiC84kV6_wFff9Y,7139
+opentelemetry/instrumentation/version.py,sha256=ffP-oEEHLyxQqazhPgp7CuNbVtp_sjb1Mo2_zNZb-QU,608
+opentelemetry/instrumentation/auto_instrumentation/__init__.py,sha256=Lt2wxHGls5h4cwG_Ff9KhcXPjEyMLmfo0X5xhf8KWdA,5991
+opentelemetry/instrumentation/auto_instrumentation/_load.py,sha256=sZtYIiP0u4LqF3YIOzYiEwKy-CDezTDOKmosnUPtTkA,7333
+opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py,sha256=3c-4MTChVWO-PpdQLpIHPp0M9pZDqnPEEN-jch6v4mU,673
+opentelemetry_instrumentation-0.58b0.dist-info/METADATA,sha256=cvIxVCXqUay2myB4jVO1BB9YWs1utoM8oGjzN6dVBBM,7090
+opentelemetry_instrumentation-0.58b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+opentelemetry_instrumentation-0.58b0.dist-info/entry_points.txt,sha256=iVv3t5REB0O58tFUEQQXYLrTCa1VVOFUXfrbvUk6_aU,279
+opentelemetry_instrumentation-0.58b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation-0.58b0.dist-info/RECORD,,

opentelemetry_instrumentation-0.56b0.dist-info/RECORD

@@ -1,20 +0,0 @@
-opentelemetry/instrumentation/_semconv.py,sha256=3WGq8pHAq1iI0pPGDzKgs25XnTXKCxfa3QP3esI-buE,15401
-opentelemetry/instrumentation/bootstrap.py,sha256=Q-1j1G7QKXTTvH5xGGGRX3jCpTf_NuhBoy2X_MvM9sg,5428
-opentelemetry/instrumentation/bootstrap_gen.py,sha256=AzV9UUf01J4EAyqF7ItNG_xeUmnHcnI8Zc5gR2WkUiU,7629
-opentelemetry/instrumentation/dependencies.py,sha256=nisISnhEy2KpzKlOqYF4QTD1PJzh7rFwpalzjzcSYFM,2254
-opentelemetry/instrumentation/distro.py,sha256=l7wjM9eR44X-Bk6w-b3_kW3_QgW82OiITRTOY48shZk,2168
-opentelemetry/instrumentation/environment_variables.py,sha256=oRcbNSSbnqJMQ3r4gBhK6jqtuI5WizapP962Z8DrVZ8,905
-opentelemetry/instrumentation/instrumentor.py,sha256=5nKN5yGZHOiNoiMBbbB_QOdjayyBAx3PP1C8KpUWRiY,5022
-opentelemetry/instrumentation/propagators.py,sha256=hBkG70KlMUiTjxPeiyOhkb_eE96DRVzRyY4fEIzMqD4,4070
-opentelemetry/instrumentation/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-opentelemetry/instrumentation/sqlcommenter_utils.py,sha256=oh97wDXsXvU8GdxGRpWGxcneAz5_dwTBa1U-OVp0zMU,1963
-opentelemetry/instrumentation/utils.py,sha256=-_D9pwXqGGsq6yUuj88TV7GpaYeatPWDpSmpf-nKpFQ,7117
-opentelemetry/instrumentation/version.py,sha256=Lt3ez1q5jzk4LG8aTMzoNp4bUxxWBqofY7vWXcRBByA,608
-opentelemetry/instrumentation/auto_instrumentation/__init__.py,sha256=H0cTlxCpdudhhr8IoXjpgCdsH6aDYgPTdTzu06WrEVc,4903
-opentelemetry/instrumentation/auto_instrumentation/_load.py,sha256=mv3S-FYEnmjdcTmWZsSPJbUkKoerK9E4L-KlZlv0Eks,5826
-opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py,sha256=3c-4MTChVWO-PpdQLpIHPp0M9pZDqnPEEN-jch6v4mU,673
-opentelemetry_instrumentation-0.56b0.dist-info/METADATA,sha256=a0czcpbYVrPy_-3Ql22ibQe7VrfyD0KX7Oa2y9ZwJCc,6748
-opentelemetry_instrumentation-0.56b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-opentelemetry_instrumentation-0.56b0.dist-info/entry_points.txt,sha256=iVv3t5REB0O58tFUEQQXYLrTCa1VVOFUXfrbvUk6_aU,279
-opentelemetry_instrumentation-0.56b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation-0.56b0.dist-info/RECORD,,