locust 2.46.8.dev8__tar.gz → 2.46.8.dev24__tar.gz

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: locust
-Version: 2.46.8.dev8
+Version: 2.46.8.dev24
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.8.dev8'
-__version_tuple__ = version_tuple = (2, 46, 8, 'dev8')
+__version__ = version = '2.46.8.dev24'
+__version_tuple__ = version_tuple = (2, 46, 8, 'dev24')
 
 __commit_id__ = commit_id = None

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/locust/contrib/csv_request_logger.py

@@ -149,7 +149,7 @@ class CsvRequestLogger:
         *,
         request_type: str,
         name: str,
-        response_time: float,
+        response_time: float | None,
         response_length: int,
         exception: Any = None,
         response: Any = None,
@@ -170,7 +170,7 @@ class CsvRequestLogger:
                 round(ts, 6),
                 request_type,
                 name,
-                round(response_time, 2),
+                round(response_time, 2) if response_time is not None else "",
                 response_length,
                 status_code,
                 exc_str,

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/locust/contrib/fasthttp.py

@@ -633,9 +633,9 @@ class LocustUserAgent(UserAgent):
     def _urlopen(self, request):
         """Override _urlopen() in order to make it use the response_type attribute"""
         client = self.clientpool.get_client(request.url_split)
-        resp = client.request(
-            request.method, request.url_split.request_uri, body=request.payload, headers=request.headers
-        )
+        # quoted_uri (percent-encoded, as geventhttpclient's own UserAgent sends it) was added in geventhttpclient 2.3.4
+        request_uri = getattr(request.url_split, "quoted_uri", request.url_split.request_uri)
+        resp = client.request(request.method, request_uri, body=request.payload, headers=request.headers)
         return self.response_type(resp, request=request, sent_request=resp._sent_request)
 
     def _verify_status(self, status_code, url=None):

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/locust/opentelemetry.py

@@ -53,7 +53,9 @@ def setup_opentelemetry(locustfile: str, profile: str | None) -> bool:
 
         @events.request.add_listener
         def on_request(name, response_time, exception, **kwargs):
-            if len(request_names) < MAX_REQUEST_NAMES:
+            if name in request_names:
+                attributes = {"name": name}
+            elif len(request_names) < MAX_REQUEST_NAMES:
                 request_names.add(name)
                 attributes = {"name": name}
             else:
@@ -62,7 +64,9 @@ def setup_opentelemetry(locustfile: str, profile: str | None) -> bool:
             if exception:
                 attributes["error.type"] = exception.__class__.__name__
 
-            ttlb_histogram.record(response_time / 1000.0, attributes=attributes)
+            # response_time is None for requests that have no duration (typically async requests)
+            if response_time is not None:
+                ttlb_histogram.record(response_time / 1000.0, attributes=attributes)
 
         @events.init.add_listener
         def on_locust_init(runner, **kwargs):

{locust-2.46.8.dev8 → locust-2.46.8.dev24}/locust/web.py

@@ -162,6 +162,7 @@ class WebUI:
         app.debug = True
         self.greenlet: gevent.Greenlet | None = None
         self._swarm_greenlet: gevent.Greenlet | None = None
+        self._run_time_greenlet: gevent.Greenlet | None = None
         self.template_args = {}
         self.auth_args = {}
         self.app.template_folder = build_path or DEFAULT_BUILD_PATH
@@ -336,6 +337,7 @@ class WebUI:
             if self._swarm_greenlet is not None:
                 self._swarm_greenlet.kill(block=True)
                 self._swarm_greenlet = None
+            self._cancel_run_time_timer()
 
             if environment.runner is not None:
                 if user_count is None or user_count < 0 or spawn_rate is None or spawn_rate <= 0:
@@ -350,7 +352,8 @@ class WebUI:
                     "host": environment.host,
                 }
                 if run_time:
-                    gevent.spawn_later(run_time, self._stop_runners).link_exception(greenlet_exception_handler)
+                    self._run_time_greenlet = gevent.spawn_later(run_time, self._stop_runners)
+                    self._run_time_greenlet.link_exception(greenlet_exception_handler)
                     response_data["run_time"] = run_time
 
                 if self.userclass_picker_is_active:
@@ -366,6 +369,7 @@ class WebUI:
             if self._swarm_greenlet is not None:
                 self._swarm_greenlet.kill(block=True)
                 self._swarm_greenlet = None
+            self._cancel_run_time_timer()
             if environment.runner is not None:
                 environment.runner.stop()
             return jsonify({"success": True, "message": "Test stopped"})
@@ -797,5 +801,11 @@ class WebUI:
         self.environment._remove_user_classes_with_weight_zero()
         self.environment._validate_user_class_name_uniqueness()
 
+    def _cancel_run_time_timer(self):
+        if self._run_time_greenlet is not None:
+            self._run_time_greenlet.kill(block=False)
+            self._run_time_greenlet = None
+
     def _stop_runners(self):
+        self._run_time_greenlet = None
         self.environment.runner.stop()