locust 2.46.2.dev18__tar.gz → 2.46.3__tar.gz

{locust-2.46.2.dev18 → locust-2.46.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.46.2.dev18
+Version: 2.46.3
 Summary: Developer-friendly load testing framework
 Project-URL: Homepage, https://locust.cloud/
 Project-URL: Repository, https://github.com/locustio/locust

{locust-2.46.2.dev18 → locust-2.46.3}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.46.2.dev18'
-__version_tuple__ = version_tuple = (2, 46, 2, 'dev18')
+__version__ = version = '2.46.3'
+__version_tuple__ = version_tuple = (2, 46, 3)
 
 __commit_id__ = commit_id = None

{locust-2.46.2.dev18 → locust-2.46.3}/locust/main.py

@@ -438,6 +438,7 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
     else:
         stats_csv_writer = stats.StatsCSV(environment, stats.PERCENTILES_TO_REPORT)
 
+    url = None
     # start Web UI
     if not options.headless and not options.worker:
         protocol = "https" if options.tls_cert and options.tls_key else "http"
@@ -610,8 +611,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
                         if runner.state != "spawning"
                         else logging.warning("Spawning users, can't stop right now")
                     ),
-                    "\r": lambda: webbrowser.open_new_tab(url),
-                    "\n": lambda: webbrowser.open_new_tab(url),
+                    "\r": lambda: webbrowser.open_new_tab(url) if url else None,
+                    "\n": lambda: webbrowser.open_new_tab(url) if url else None,
                 },
             )
         )
@@ -659,6 +660,8 @@ See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-numb
             stats.print_percentile_stats(runner.stats)
             stats.print_error_report(runner.stats)
         environment.events.quit.fire(exit_code=code)
+        if stats_csv_writer is not None:
+            stats_csv_writer.close_files()
         sys.exit(code)
 
     # install SIGTERM handler

{locust-2.46.2.dev18 → locust-2.46.3}/locust/opentelemetry.py

@@ -45,7 +45,8 @@ def setup_opentelemetry(locustfile: str, profile: str | None) -> bool:
     if metrics_exporters:
         meter_provider = _setup_meter_provider(resource, metrics_exporters)
         metrics.set_meter_provider(meter_provider)
-        ttlb_histogram = metrics.get_meter("locust").create_histogram(
+        meter = metrics.get_meter("locust")
+        ttlb_histogram = meter.create_histogram(
             "locust.client.duration", unit="s", description="Time to last byte for requests"
         )
 
@@ -62,6 +63,22 @@ def setup_opentelemetry(locustfile: str, profile: str | None) -> bool:
 
             ttlb_histogram.record(response_time / 1000.0, attributes=attributes)
 
+        @events.init.add_listener
+        def on_locust_init(runner, **kwargs):
+            if runner is None:
+                return
+
+            def observe_user_count(options):
+                for user_class, count in runner.user_classes_count.items():
+                    yield metrics.Observation(count, {"user_class": user_class})
+
+            meter.create_observable_gauge(
+                "locust.users.count",
+                callbacks=[observe_user_count],
+                unit="{user}",
+                description="Number of currently running Locust users",
+            )
+
     if logs_exporters:
         logger_provider = _setup_logger_provider(resource, logs_exporters)
         _logs.set_logger_provider(logger_provider)

{locust-2.46.2.dev18 → locust-2.46.3}/locust/runners.py

@@ -1527,4 +1527,4 @@ def _format_user_classes_count_for_log(user_classes_count: dict[str, int]) -> st
 def _aggregate_dispatched_users(d: dict[str, dict[str, int]]) -> dict[str, int]:
     # TODO: Test it
     user_classes = list(next(iter(d.values())).keys())
-    return {u: sum(d[u] for d in d.values()) for u in user_classes}
+    return {u: sum(worker_counts[u] for worker_counts in d.values()) for u in user_classes}

{locust-2.46.2.dev18 → locust-2.46.3}/locust/stats.py

@@ -1101,6 +1101,9 @@ class StatsCSV:
         for exc in self.environment.runner.exceptions.values():
             csv_writer.writerow([exc["count"], exc["msg"], exc["traceback"], ", ".join(exc["nodes"])])
 
+    def close_files(self) -> None:
+        pass
+
 
 class StatsCSVFileWriter(StatsCSV):
     """Write statistics to CSV files"""

{locust-2.46.2.dev18 → locust-2.46.3}/pyproject.toml

@@ -75,7 +75,7 @@ default-groups = ["build", "test", "lint"]
 [dependency-groups]
 build = ["hatch==1.16.5", "hatch-vcs>=0.4.0"]
 test = [
-    "cryptography>=43.0.1,<47.0.0",
+    "cryptography>=43.0.1,<49.0.0",
     "pyquery>=2.0.0,<3.0.0",
     "retry>=0.9.2,<1.0.0",
 ]
@@ -202,7 +202,7 @@ reportOptionalMemberAccess = "none"
 [tool.hatch.envs.hatch-test]
 default-args = ["locust/test"]
 dependencies = [
-    "cryptography>=43.0.1,<47.0.0",
+    "cryptography>=43.0.1,<49.0.0",
     "pyquery>=2.0.1,<3.0.0",
     "pytest>=8.3.3,<10",
     "retry>=0.9.2,<1.0.0",