locust 2.46.8.dev14__tar.gz → 2.46.8.dev30__tar.gz

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/PKG-INFO

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

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/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.dev14'
-__version_tuple__ = version_tuple = (2, 46, 8, 'dev14')
+__version__ = version = '2.46.8.dev30'
+__version_tuple__ = version_tuple = (2, 46, 8, 'dev30')
 
 __commit_id__ = commit_id = None

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/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.dev14 → locust-2.46.8.dev30}/locust/contrib/fasthttp.py

@@ -78,6 +78,7 @@ FAILURE_EXCEPTIONS = (
     SSLError,
     Timeout,
     HTTPConnectionClosed,
+    HTTPParseError,
     zlib.error,
 )
 
@@ -294,7 +295,7 @@ class FastHttpSession:
         else:
             try:
                 request_meta["response_length"] = len(response.content) if response.content else 0
-            except (HTTPParseError, *FAILURE_EXCEPTIONS) as e:
+            except FAILURE_EXCEPTIONS as e:
                 request_meta["response_time"] = (time.perf_counter() - start_perf_counter) * 1000
                 request_meta["exception"] = e  # type: ignore
                 if catch_response:

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/locust/html.py

@@ -21,7 +21,9 @@ def process_html_filename(options) -> None:
     }
     for option_term, option_value in option_mapping.items():
         if option_value is not None:
-            options.html_file = options.html_file.replace(option_term, str(int(option_value)))
+            # -r is a float option, so a fractional spawn rate must survive the substitution.
+            replacement = str(int(option_value)) if float(option_value).is_integer() else str(option_value)
+            options.html_file = options.html_file.replace(option_term, replacement)
 
 
 def render_template_from(file, build_path=DEFAULT_BUILD_PATH, **kwargs):

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/locust/main.py

@@ -109,8 +109,14 @@ def merge_locustfiles_content(
         for _shape_class in shape_classes:
             shape_class_name = type(_shape_class).__name__
             if shape_class_name in available_shape_classes.keys():
-                sys.stderr.write(f"Duplicate shape classes: {shape_class_name}\n")
-                sys.exit(1)
+                previous_path = inspect.getfile(type(available_shape_classes[shape_class_name]))
+                new_path = inspect.getfile(type(_shape_class))
+                if previous_path == new_path:
+                    # The same shape class was defined in two locustfiles but one probably imported the other, so we just ignore it
+                    continue
+                else:
+                    sys.stderr.write(f"Duplicate shape classes: {shape_class_name}\n")
+                    sys.exit(1)
 
             available_shape_classes[shape_class_name] = _shape_class
 

{locust-2.46.8.dev14 → locust-2.46.8.dev30}/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):