opentelemetry-instrumentation 0.50b0__py3-none-any.whl → 0.52b0__py3-none-any.whl

opentelemetry/instrumentation/_semconv.py

@@ -109,23 +109,23 @@ OTEL_SEMCONV_STABILITY_OPT_IN = "OTEL_SEMCONV_STABILITY_OPT_IN"
 
 class _OpenTelemetryStabilitySignalType:
     HTTP = "http"
+    DATABASE = "database"
 
 
-class _HTTPStabilityMode(Enum):
-    # http - emit the new, stable HTTP and networking conventions ONLY
+class _StabilityMode(Enum):
+    DEFAULT = "default"
     HTTP = "http"
-    # http/dup - emit both the old and the stable HTTP and networking conventions
     HTTP_DUP = "http/dup"
-    # default - continue emitting old experimental HTTP and networking conventions
-    DEFAULT = "default"
+    DATABASE = "database"
+    DATABASE_DUP = "database/dup"
 
 
-def _report_new(mode):
-    return mode.name != _HTTPStabilityMode.DEFAULT.name
+def _report_new(mode: _StabilityMode):
+    return mode != _StabilityMode.DEFAULT
 
 
-def _report_old(mode):
-    return mode.name != _HTTPStabilityMode.HTTP.name
+def _report_old(mode: _StabilityMode):
+    return mode not in (_StabilityMode.HTTP, _StabilityMode.DATABASE)
 
 
 class _OpenTelemetrySemanticConventionStability:
@@ -135,35 +135,61 @@ class _OpenTelemetrySemanticConventionStability:
 
     @classmethod
     def _initialize(cls):
-        with _OpenTelemetrySemanticConventionStability._lock:
-            if not _OpenTelemetrySemanticConventionStability._initialized:
-                # Users can pass in comma delimited string for opt-in options
-                # Only values for http stability are supported for now
-                opt_in = os.environ.get(OTEL_SEMCONV_STABILITY_OPT_IN, "")
-                opt_in_list = []
-                if opt_in:
-                    opt_in_list = [s.strip() for s in opt_in.split(",")]
-                http_opt_in = _HTTPStabilityMode.DEFAULT
-                if opt_in_list:
-                    # Process http opt-in
-                    # http/dup takes priority over http
-                    if _HTTPStabilityMode.HTTP_DUP.value in opt_in_list:
-                        http_opt_in = _HTTPStabilityMode.HTTP_DUP
-                    elif _HTTPStabilityMode.HTTP.value in opt_in_list:
-                        http_opt_in = _HTTPStabilityMode.HTTP
-                _OpenTelemetrySemanticConventionStability._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
-                    _OpenTelemetryStabilitySignalType.HTTP
-                ] = http_opt_in
-                _OpenTelemetrySemanticConventionStability._initialized = True
+        with cls._lock:
+            if cls._initialized:
+                return
+
+            # Users can pass in comma delimited string for opt-in options
+            # Only values for http and database stability are supported for now
+            opt_in = os.environ.get(OTEL_SEMCONV_STABILITY_OPT_IN)
+
+            if not opt_in:
+                # early return in case of default
+                cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING = {
+                    _OpenTelemetryStabilitySignalType.HTTP: _StabilityMode.DEFAULT,
+                    _OpenTelemetryStabilitySignalType.DATABASE: _StabilityMode.DEFAULT,
+                }
+                cls._initialized = True
+                return
+
+            opt_in_list = [s.strip() for s in opt_in.split(",")]
+
+            cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
+                _OpenTelemetryStabilitySignalType.HTTP
+            ] = cls._filter_mode(
+                opt_in_list, _StabilityMode.HTTP, _StabilityMode.HTTP_DUP
+            )
+
+            cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING[
+                _OpenTelemetryStabilitySignalType.DATABASE
+            ] = cls._filter_mode(
+                opt_in_list,
+                _StabilityMode.DATABASE,
+                _StabilityMode.DATABASE_DUP,
+            )
+
+            cls._initialized = True
+
+    @staticmethod
+    def _filter_mode(opt_in_list, stable_mode, dup_mode):
+        # Process semconv stability opt-in
+        # http/dup,database/dup has higher precedence over http,database
+        if dup_mode.value in opt_in_list:
+            return dup_mode
+
+        return (
+            stable_mode
+            if stable_mode.value in opt_in_list
+            else _StabilityMode.DEFAULT
+        )
 
     @classmethod
-    # Get OpenTelemetry opt-in mode based off of signal type (http, messaging, etc.)
     def _get_opentelemetry_stability_opt_in_mode(
-        cls,
-        signal_type: _OpenTelemetryStabilitySignalType,
-    ) -> _HTTPStabilityMode:
-        return _OpenTelemetrySemanticConventionStability._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING.get(
-            signal_type, _HTTPStabilityMode.DEFAULT
+        cls, signal_type: _OpenTelemetryStabilitySignalType
+    ) -> _StabilityMode:
+        # Get OpenTelemetry opt-in mode based off of signal type (http, messaging, etc.)
+        return cls._OTEL_SEMCONV_STABILITY_SIGNAL_MAPPING.get(
+            signal_type, _StabilityMode.DEFAULT
         )
 
 
@@ -171,14 +197,12 @@ def _filter_semconv_duration_attrs(
     attrs,
     old_attrs,
     new_attrs,
-    sem_conv_opt_in_mode=_HTTPStabilityMode.DEFAULT,
+    sem_conv_opt_in_mode=_StabilityMode.DEFAULT,
 ):
     filtered_attrs = {}
     # duration is two different metrics depending on sem_conv_opt_in_mode, so no DUP attributes
     allowed_attributes = (
-        new_attrs
-        if sem_conv_opt_in_mode == _HTTPStabilityMode.HTTP
-        else old_attrs
+        new_attrs if sem_conv_opt_in_mode == _StabilityMode.HTTP else old_attrs
     )
     for key, val in attrs.items():
         if key in allowed_attributes:
@@ -190,7 +214,7 @@ def _filter_semconv_active_request_count_attr(
     attrs,
     old_attrs,
     new_attrs,
-    sem_conv_opt_in_mode=_HTTPStabilityMode.DEFAULT,
+    sem_conv_opt_in_mode=_StabilityMode.DEFAULT,
 ):
     filtered_attrs = {}
     if _report_old(sem_conv_opt_in_mode):
@@ -367,10 +391,11 @@ def _set_status(
     status_code: int,
     status_code_str: str,
     server_span: bool = True,
-    sem_conv_opt_in_mode: _HTTPStabilityMode = _HTTPStabilityMode.DEFAULT,
+    sem_conv_opt_in_mode: _StabilityMode = _StabilityMode.DEFAULT,
 ):
     if status_code < 0:
-        metrics_attributes[ERROR_TYPE] = status_code_str
+        if _report_new(sem_conv_opt_in_mode):
+            metrics_attributes[ERROR_TYPE] = status_code_str
         if span.is_recording():
             if _report_new(sem_conv_opt_in_mode):
                 span.set_attribute(ERROR_TYPE, status_code_str)
@@ -404,7 +429,7 @@ def _set_status(
 
 
 # Get schema version based off of opt-in mode
-def _get_schema_url(mode: _HTTPStabilityMode) -> str:
-    if mode is _HTTPStabilityMode.DEFAULT:
+def _get_schema_url(mode: _StabilityMode) -> str:
+    if mode is _StabilityMode.DEFAULT:
         return "https://opentelemetry.io/schemas/1.11.0"
     return SpanAttributes.SCHEMA_URL

opentelemetry/instrumentation/auto_instrumentation/__init__.py

@@ -19,6 +19,12 @@ from os.path import abspath, dirname, pathsep
 from re import sub
 from shutil import which
 
+from opentelemetry.instrumentation.auto_instrumentation._load import (
+    _load_configurators,
+    _load_distro,
+    _load_instrumentors,
+)
+from opentelemetry.instrumentation.utils import _python_path_without_directory
 from opentelemetry.instrumentation.version import __version__
 from opentelemetry.util._importlib_metadata import entry_points
 
@@ -110,3 +116,20 @@ def run() -> None:
 
     executable = which(args.command)
     execl(executable, executable, *args.command_args)
+
+
+def initialize():
+    """Setup auto-instrumentation, called by the sitecustomize module"""
+    # prevents auto-instrumentation of subprocesses if code execs another python process
+    if "PYTHONPATH" in environ:
+        environ["PYTHONPATH"] = _python_path_without_directory(
+            environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep
+        )
+
+    try:
+        distro = _load_distro()
+        distro.configure()
+        _load_configurators()
+        _load_instrumentors(distro)
+    except Exception:  # pylint: disable=broad-except
+        _logger.exception("Failed to auto initialize OpenTelemetry")

opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py

@@ -12,33 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from logging import getLogger
-from os import environ
-from os.path import abspath, dirname, pathsep
-
-from opentelemetry.instrumentation.auto_instrumentation._load import (
-    _load_configurators,
-    _load_distro,
-    _load_instrumentors,
-)
-from opentelemetry.instrumentation.utils import _python_path_without_directory
-
-logger = getLogger(__name__)
-
-
-def initialize():
-    # prevents auto-instrumentation of subprocesses if code execs another python process
-    environ["PYTHONPATH"] = _python_path_without_directory(
-        environ["PYTHONPATH"], dirname(abspath(__file__)), pathsep
-    )
-
-    try:
-        distro = _load_distro()
-        distro.configure()
-        _load_configurators()
-        _load_instrumentors(distro)
-    except Exception:  # pylint: disable=broad-except
-        logger.exception("Failed to auto initialize opentelemetry")
-
+from opentelemetry.instrumentation.auto_instrumentation import initialize
 
 initialize()

opentelemetry/instrumentation/bootstrap_gen.py

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

opentelemetry/instrumentation/dependencies.py

@@ -47,13 +47,14 @@ def get_dist_dependency_conflicts(
     extra = "extra"
     instruments = "instruments"
     instruments_marker = {extra: instruments}
-    for dep in dist.requires:
-        if extra not in dep or instruments not in dep:
-            continue
-
-        req = Requirement(dep)
-        if req.marker.evaluate(instruments_marker):
-            instrumentation_deps.append(req)
+    if dist.requires:
+        for dep in dist.requires:
+            if extra not in dep or instruments not in dep:
+                continue
+
+            req = Requirement(dep)
+            if req.marker.evaluate(instruments_marker):
+                instrumentation_deps.append(req)
 
     return get_dependency_conflicts(instrumentation_deps)
 

opentelemetry/instrumentation/utils.py

@@ -12,11 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 import urllib.parse
 from contextlib import contextmanager
 from importlib import import_module
 from re import escape, sub
-from typing import Dict, Iterable, Sequence, Union
+from typing import Any, Dict, Generator, Sequence
 
 from wrapt import ObjectProxy
 
@@ -44,9 +46,9 @@ _SUPPRESS_INSTRUMENTATION_KEY_PLAIN = (
 
 
 def extract_attributes_from_object(
-    obj: any, attributes: Sequence[str], existing: Dict[str, str] = None
+    obj: Any, attributes: Sequence[str], existing: Dict[str, str] | None = None
 ) -> Dict[str, str]:
-    extracted = {}
+    extracted: dict[str, str] = {}
     if existing:
         extracted.update(existing)
     for attr in attributes:
@@ -81,7 +83,7 @@ def http_status_to_status_code(
     return StatusCode.ERROR
 
 
-def unwrap(obj: Union[object, str], attr: str):
+def unwrap(obj: object, attr: str):
     """Given a function that was wrapped by wrapt.wrap_function_wrapper, unwrap it
 
     The object containing the function to unwrap may be passed as dotted module path string.
@@ -152,7 +154,7 @@ def _start_internal_or_server_span(
     return span, token
 
 
-def _url_quote(s) -> str:  # pylint: disable=invalid-name
+def _url_quote(s: Any) -> str:  # pylint: disable=invalid-name
     if not isinstance(s, (str, bytes)):
         return s
     quoted = urllib.parse.quote(s)
@@ -163,13 +165,13 @@ def _url_quote(s) -> str:  # pylint: disable=invalid-name
     return quoted.replace("%", "%%")
 
 
-def _get_opentelemetry_values() -> dict:
+def _get_opentelemetry_values() -> dict[str, Any]:
     """
     Return the OpenTelemetry Trace and Span IDs if Span ID is set in the
     OpenTelemetry execution context.
     """
     # Insert the W3C TraceContext generated
-    _headers = {}
+    _headers: dict[str, Any] = {}
     propagator.inject(_headers)
     return _headers
 
@@ -196,7 +198,7 @@ def is_http_instrumentation_enabled() -> bool:
 
 
 @contextmanager
-def _suppress_instrumentation(*keys: str) -> Iterable[None]:
+def _suppress_instrumentation(*keys: str) -> Generator[None]:
     """Suppress instrumentation within the context."""
     ctx = context.get_current()
     for key in keys:
@@ -209,7 +211,7 @@ def _suppress_instrumentation(*keys: str) -> Iterable[None]:
 
 
 @contextmanager
-def suppress_instrumentation() -> Iterable[None]:
+def suppress_instrumentation() -> Generator[None]:
     """Suppress instrumentation within the context."""
     with _suppress_instrumentation(
         _SUPPRESS_INSTRUMENTATION_KEY, _SUPPRESS_INSTRUMENTATION_KEY_PLAIN
@@ -218,7 +220,7 @@ def suppress_instrumentation() -> Iterable[None]:
 
 
 @contextmanager
-def suppress_http_instrumentation() -> Iterable[None]:
+def suppress_http_instrumentation() -> Generator[None]:
     """Suppress instrumentation within the context."""
     with _suppress_instrumentation(_SUPPRESS_HTTP_INSTRUMENTATION_KEY):
         yield

opentelemetry/instrumentation/version.py

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

{opentelemetry_instrumentation-0.50b0.dist-info → opentelemetry_instrumentation-0.52b0.dist-info}/METADATA

@@ -1,10 +1,12 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: opentelemetry-instrumentation
-Version: 0.50b0
+Version: 0.52b0
 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
 Author-email: OpenTelemetry Authors <cncf-opentelemetry-contributors@lists.cncf.io>
-License: Apache-2.0
+License-Expression: Apache-2.0
+License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -15,9 +17,10 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 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.50b0
+Requires-Dist: opentelemetry-semantic-conventions==0.52b0
 Requires-Dist: packaging>=18.0
 Requires-Dist: wrapt<2.0.0,>=1.0.0
 Description-Content-Type: text/x-rst
@@ -154,6 +157,19 @@ start celery with the rest of the arguments.
 The above command will configure the global trace provider to use the Random IDs Generator, and then
 pass ``--port=3000`` to ``flask run``.
 
+Programmatic Auto-instrumentation
+---------------------------------
+
+::
+
+    from opentelemetry.instrumentation import auto_instrumentation
+    auto_instrumentation.initialize()
+
+
+If you are in an environment where you cannot use opentelemetry-instrument to inject auto-instrumentation you can do so programmatically with
+the code above. Please note that some instrumentations may require the ``initialize()`` method to be called before the library they
+instrument is imported.
+
 References
 ----------
 

{opentelemetry_instrumentation-0.50b0.dist-info → opentelemetry_instrumentation-0.52b0.dist-info}/RECORD

@@ -1,20 +1,20 @@
-opentelemetry/instrumentation/_semconv.py,sha256=eX7jtDvnLjCogil0SRZ4q_ftKWyJRNKiOkiuDRNVzgA,14582
+opentelemetry/instrumentation/_semconv.py,sha256=AD7Yc_q7Fm4bbxS2l6OadfCQtF4murmrzC-BOfJm5Vk,14913
 opentelemetry/instrumentation/bootstrap.py,sha256=Q-1j1G7QKXTTvH5xGGGRX3jCpTf_NuhBoy2X_MvM9sg,5428
-opentelemetry/instrumentation/bootstrap_gen.py,sha256=180wfVplcLV2N0HCU4BYhcg9cC5iHs9aKEdbLRp-IIs,7095
-opentelemetry/instrumentation/dependencies.py,sha256=zZR_oFabATG2sPnPoi1ewxYdhU9AbEb8t1_q1Z1FMG0,2564
+opentelemetry/instrumentation/bootstrap_gen.py,sha256=MiOnnPbE3CoakyP197WzsGhDAGhhp9VDvBH_vzOL2eQ,7504
+opentelemetry/instrumentation/dependencies.py,sha256=OpZBPaAvxJX8tlftqrsVxyQZkCa9uDgfzA2DA0SO_To,2610
 opentelemetry/instrumentation/distro.py,sha256=l7wjM9eR44X-Bk6w-b3_kW3_QgW82OiITRTOY48shZk,2168
 opentelemetry/instrumentation/environment_variables.py,sha256=oRcbNSSbnqJMQ3r4gBhK6jqtuI5WizapP962Z8DrVZ8,905
 opentelemetry/instrumentation/instrumentor.py,sha256=X5UkWHebXgNBwyrZaHQk-sufWfktrkymkkyzPiel7VY,4558
 opentelemetry/instrumentation/propagators.py,sha256=hBkG70KlMUiTjxPeiyOhkb_eE96DRVzRyY4fEIzMqD4,4070
 opentelemetry/instrumentation/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 opentelemetry/instrumentation/sqlcommenter_utils.py,sha256=yV_-hcwy_3ckP76_FC2dOrd8IKi9z_9s980ZMuGYkrE,1960
-opentelemetry/instrumentation/utils.py,sha256=4SvKC9Rg1tMcQe5SiAtbX82Xe5lXx1ltMdrCGLhmc3o,7037
-opentelemetry/instrumentation/version.py,sha256=sBsbV8VQNTte60quPySrr3hMzVnRCO8AnGlwnGPP60o,608
-opentelemetry/instrumentation/auto_instrumentation/__init__.py,sha256=G3qhU-ZfdATzPdsZCvBZ2CT8kNZ1Wc8l7fETXKTPF2M,3800
+opentelemetry/instrumentation/utils.py,sha256=-_D9pwXqGGsq6yUuj88TV7GpaYeatPWDpSmpf-nKpFQ,7117
+opentelemetry/instrumentation/version.py,sha256=8ybzJrIcr5CRW9fxlL7vXcvj3IIncnVl6eHpEEIxEYk,608
+opentelemetry/instrumentation/auto_instrumentation/__init__.py,sha256=POBH-53aBJ_y9-kk95Kcst9tf2gOcnhWM-Cue-QXvgY,4637
 opentelemetry/instrumentation/auto_instrumentation/_load.py,sha256=e3IlquYKHgLuZXZ9pjMg76yxiM0Qa_-6qxgPFL-Vmh0,6301
-opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py,sha256=p3cz9NlKNlnzxc7guFSPyztx8XMUteAxkN1NFYXSH-0,1449
-opentelemetry_instrumentation-0.50b0.dist-info/METADATA,sha256=gKyJL8AMbUmuI-LOs0weuxhS_wTYOC_AAC0QLS8zyOY,6147
-opentelemetry_instrumentation-0.50b0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-opentelemetry_instrumentation-0.50b0.dist-info/entry_points.txt,sha256=iVv3t5REB0O58tFUEQQXYLrTCa1VVOFUXfrbvUk6_aU,279
-opentelemetry_instrumentation-0.50b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-opentelemetry_instrumentation-0.50b0.dist-info/RECORD,,
+opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py,sha256=3c-4MTChVWO-PpdQLpIHPp0M9pZDqnPEEN-jch6v4mU,673
+opentelemetry_instrumentation-0.52b0.dist-info/METADATA,sha256=Ao9X6xKBsaFT7zqSqr2eRtqNRfnoNhGLaJ0ohh-mMDo,6798
+opentelemetry_instrumentation-0.52b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+opentelemetry_instrumentation-0.52b0.dist-info/entry_points.txt,sha256=iVv3t5REB0O58tFUEQQXYLrTCa1VVOFUXfrbvUk6_aU,279
+opentelemetry_instrumentation-0.52b0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+opentelemetry_instrumentation-0.52b0.dist-info/RECORD,,

{opentelemetry_instrumentation-0.50b0.dist-info → opentelemetry_instrumentation-0.52b0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.3
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any