locust-cloud 1.5.9__py3-none-any.whl → 1.5.11__py3-none-any.whl

locust_cloud/__init__.py

@@ -66,7 +66,7 @@ def create_connection_pool(
         return ConnectionPool(
             conninfo=f"postgres://{pg_user}:{pg_password}@{pg_host}:{pg_port}/{pg_database}?sslmode=require",
             min_size=1,
-            max_size=5,
+            max_size=10,
             configure=set_autocommit,
         )
     except Exception:

locust_cloud/cloud.py

@@ -201,10 +201,10 @@ def main() -> None:
     deployed_pods: list[Any] = []
     worker_count: int = max(options.workers or math.ceil(options.users / USERS_PER_WORKER), 2)
     os.environ["AWS_DEFAULT_REGION"] = options.region
-    if options.users > 10000:
-        logger.error("You asked for more than 10000 Users, that isn't allowed.")
+    if options.users > 5000000:
+        logger.error("You asked for more than 5000000 Users, that isn't allowed.")
         sys.exit(1)
-    if worker_count > 20:
+    if worker_count > 1000:
         logger.error("You asked for more than 20 workers, that isn't allowed.")
         sys.exit(1)
     try:

locust_cloud/constants.py

@@ -2,4 +2,4 @@ DEFAULT_REGION_NAME = "us-east-1"
 DEFAULT_CLUSTER_NAME = "dmdb"
 DEFAULT_NAMESPACE = "default"
 DEFAULT_DEPLOYER_URL = "https://api.locust.cloud/1"
-USERS_PER_WORKER = 500
+USERS_PER_WORKER = 5000

locust_cloud/timescale/exporter.py

@@ -12,6 +12,7 @@ import locust.env
 import psycopg
 import psycopg.types.json
 from locust.exception import CatchResponseError
+from locust.runners import MasterRunner
 
 
 def safe_serialize(obj):
@@ -185,11 +186,19 @@ class Exporter:
         cmd = sys.argv[1:]
         with self.pool.connection() as conn:
             conn.execute(
-                "INSERT INTO testruns (id, num_users, description, arguments) VALUES (%s,%s,%s,%s)",
+                "INSERT INTO testruns (id, num_users, worker_count, username, locustfile, description, arguments) VALUES (%s,%s,%s,%s,%s,%s,%s)",
                 (
                     self._run_id,
                     self.env.runner.target_user_count if self.env.runner else 1,
-                    "self.env.parsed_options.description",
+                    len(self.env.runner.clients)
+                    if isinstance(
+                        self.env.runner,
+                        MasterRunner,
+                    )
+                    else 0,
+                    self.env.web_ui.template_args.get("username", "") if self.env.web_ui else "",
+                    self.env.parsed_locustfiles[0].split("/")[-1],
+                    self.env.parsed_options.description,
                     " ".join(cmd),
                 ),
             )

locust_cloud/timescale/queries.py

@@ -198,7 +198,10 @@ SELECT
  requests,
  date_trunc('second', end_time - id) AS "runTime",
  description,
- exit_code as "exitCode"
+ exit_code as "exitCode",
+ username,
+ worker_count as "workerCount",
+ locustfile
 FROM testruns
 ORDER BY id DESC
 """

locust_cloud/timescale/query.py

@@ -59,5 +59,5 @@ def register_query(environment, pool):
                 logger.warning(f"Received invalid query key: '{query}'")
                 return make_response("Invalid query key", 401)
         except Exception as e:
-            logger.error(f"Error executing query '{query}': {e}", exc_info=True)
+            logger.info(f"Error executing UI query '{query}': {e}", exc_info=True)
             return make_response("Error executing query", 401)