locust 2.42.4.dev23__tar.gz → 2.42.4.dev30__tar.gz

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.42.4.dev23
+Version: 2.42.4.dev30
 Summary: Developer-friendly load testing framework
 Project-URL: homepage, https://locust.io/
 Project-URL: repository, https://github.com/locustio/locust
@@ -31,7 +31,7 @@ Requires-Dist: flask-login>=0.6.3
 Requires-Dist: flask>=2.0.0
 Requires-Dist: gevent!=25.8.1,<26.0.0,>=24.10.1
 Requires-Dist: geventhttpclient>=2.3.1
-Requires-Dist: locust-cloud>=1.28.1
+Requires-Dist: locust-cloud>=1.29.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: psutil>=5.9.1
 Requires-Dist: pytest<10,>=8.3.3

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/locust/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.42.4.dev23'
-__version_tuple__ = version_tuple = (2, 42, 4, 'dev23')
+__version__ = version = '2.42.4.dev30'
+__version_tuple__ = version_tuple = (2, 42, 4, 'dev30')
 
 __commit_id__ = commit_id = None

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/locust/argument_parser.py

@@ -876,6 +876,12 @@ Typically ONLY these options (and --locustfile) need to be specified on workers,
         type=str,
         help="Set a profile to group the testruns together",
     )
+    other_group.add_argument(
+        "--otel",
+        action="store_true",
+        help="Instrument the Locust test run with OpenTelemetry.",
+        env_var="LOCUST_ENABLE_OPENTELEMETRY",
+    )
 
     user_classes_group = parser.add_argument_group("User classes")
     user_classes_group.add_argument(

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/locust/main.py

@@ -202,7 +202,8 @@ def main():
     if not options.skip_log_setup:
         setup_logging(options.loglevel, options.logfile)
 
-    setup_opentelemetry()
+    if options.otel:
+        setup_opentelemetry()
 
     children = []
     logger = logging.getLogger(__name__)

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/locust/opentelemetry.py

@@ -11,7 +11,7 @@ def setup_opentelemetry():
         from opentelemetry import metrics, trace
         from opentelemetry.sdk.resources import Resource
     except ImportError:
-        logger.debug("OpenTelemetry SDK is not installed, opentelemetry not enabled. Run 'pip install locust[otel]")
+        logger.error("OpenTelemetry SDK is not installed, opentelemetry not enabled. Run 'pip install locust[otel]")
         return
 
     traces_exporters = set(e.strip().lower() for e in os.getenv("OTEL_TRACES_EXPORTER", "otlp").split(",") if e.strip())
@@ -129,9 +129,15 @@ def _setup_meter_provider(resource, metrics_exporters):
 
 def _setup_auto_instrumentation():
     try:
+        import requests
         from opentelemetry.instrumentation.requests import RequestsInstrumentor
+        from opentelemetry.sdk.trace import Span
 
-        RequestsInstrumentor().instrument()
+        def request_hook(span: Span, request: requests.PreparedRequest):
+            span.update_name(f"{request.method} {request.url}")
+            return
+
+        RequestsInstrumentor().instrument(request_hook=request_hook)
     except ImportError:
         logger.info(
             "OpenTelemetry 'requests' instrumentation is not installed. Please install 'opentelemetry-instrumentation-requests'"

{locust-2.42.4.dev23 → locust-2.42.4.dev30}/pyproject.toml

@@ -46,7 +46,7 @@ dependencies = [
     "Flask-Login>=0.6.3",
     "Flask-Cors>=3.0.10",
     "pywin32; sys_platform == 'win32'",
-    "locust-cloud>=1.28.1",
+    "locust-cloud>=1.29.0",
     "gevent>=24.10.1,<26.0.0,!=25.8.1",
     "python-socketio[client]>=5.13.0",
     "python-engineio>=4.12.2",