Merge branch 'main' into sqlcomment-docs

Author: tammy-baylis-swi

CHANGELOG.md

@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3688](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3688))
 - `opentelemetry-instrumentation-tornado` Fix server (request) duration metric calculation
   ([#3679](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3679))
+- `opentelemetry-instrumentation-tornado`: Fix to properly skip all server telemetry when URL excluded.
+  ([#3680](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3680))
 - `opentelemetry-instrumentation`: Avoid calls to `context.detach` with `None` token.
   ([#3673](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3673))
 - `opentelemetry-instrumentation-starlette`/`opentelemetry-instrumentation-fastapi`: Fixes a crash when host-based routing is used
@@ -36,6 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3666](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3666))
 - `opentelemetry-sdk-extension-aws` Add AWS X-Ray Remote Sampler with initial Rules Poller implementation
   ([#3366](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3366))
+- `opentelemetry-instrumentation`: add support for  `OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH` to inform opentelemetry-instrument about gevent monkeypatching
+  ([#3699](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3699))
 
 ## Version 1.36.0/0.57b0 (2025-07-29)
 

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -403,11 +403,14 @@ def _wrap(cls, method_name, wrapper):
 def _prepare(
     tracer, server_histograms, request_hook, func, handler, args, kwargs
 ):
-    otel_handler_state = {_START_TIME: default_timer()}
+    request = handler.request
+    otel_handler_state = {
+        _START_TIME: default_timer(),
+        "exclude_request": _excluded_urls.url_disabled(request.uri),
+    }
     setattr(handler, _HANDLER_STATE_KEY, otel_handler_state)
 
-    request = handler.request
-    if _excluded_urls.url_disabled(request.uri):
+    if otel_handler_state["exclude_request"]:
         return func(*args, **kwargs)
 
     _record_prepare_metrics(server_histograms, handler)
@@ -625,6 +628,8 @@ def _record_prepare_metrics(server_histograms, handler):
 
 def _record_on_finish_metrics(server_histograms, handler, error=None):
     otel_handler_state = getattr(handler, _HANDLER_STATE_KEY, None) or {}
+    if otel_handler_state.get("exclude_request"):
+        return
     start_time = otel_handler_state.get(_START_TIME, None) or default_timer()
     elapsed_time = round((default_timer() - start_time) * 1000)
 

instrumentation/opentelemetry-instrumentation-tornado/tests/test_metrics_instrumentation.py

@@ -252,3 +252,16 @@ def test_metric_uninstrument(self):
             for point in list(metric.data.data_points):
                 if isinstance(point, HistogramDataPoint):
                     self.assertEqual(point.count, 1)
+
+    def test_exclude_lists(self):
+        def test_excluded(path):
+            self.fetch(path)
+
+            # Verify no server metrics written (only client ones should exist)
+            metrics = self.get_sorted_metrics()
+            for metric in metrics:
+                self.assertTrue("http.server" not in metric.name, metric)
+            self.assertEqual(len(metrics), 3, metrics)
+
+        test_excluded("/healthz")
+        test_excluded("/ping")

opentelemetry-instrumentation/README.rst

@@ -104,7 +104,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/src/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 @@
     _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/src/opentelemetry/instrumentation/environment_variables.py

@@ -26,3 +26,10 @@
 """
 .. 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/test-requirements.txt

@@ -1,5 +1,6 @@
 asgiref==3.8.1
 Deprecated==1.2.14
+gevent==25.5.1
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

opentelemetry-instrumentation/tests/auto_instrumentation/test_initialize.py

@@ -72,3 +72,30 @@ def test_reraises_exceptions(self, load_distro_mock, logger_mock):
             )
 
         self.assertEqual("inner exception", str(em.exception))
+
+    @patch.dict(
+        "os.environ",
+        {
+            "OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH": "patch_foo"
+        },
+    )
+    @patch("opentelemetry.instrumentation.auto_instrumentation._logger")
+    def test_handles_invalid_gevent_monkeypatch(self, logger_mock):
+        # pylint:disable=no-self-use
+        auto_instrumentation.initialize()
+        logger_mock.error.assert_called_once_with(
+            "%s value must be `patch_all`",
+            "OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH",
+        )
+
+    @patch.dict(
+        "os.environ",
+        {
+            "OTEL_PYTHON_AUTO_INSTRUMENTATION_EXPERIMENTAL_GEVENT_PATCH": "patch_all"
+        },
+    )
+    @patch("opentelemetry.instrumentation.auto_instrumentation._logger")
+    def test_handles_patch_all_gevent_monkeypatch(self, logger_mock):
+        # pylint:disable=no-self-use
+        auto_instrumentation.initialize()
+        logger_mock.error.assert_not_called()