locust-cloud 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

locust_cloud/cloud.py

@@ -173,6 +173,13 @@ parser.add_argument(
     action="store_true",
     help="Delete a running cluster. Useful if locust-cloud was killed/disconnected or if there was an error.",
 )
+parser.add_argument(
+    "--image-tag",
+    type=str,
+    env_var="LOCUST_CLOUD_IMAGE_TAG",
+    default="latest",
+    help=configargparse.SUPPRESS,  # overrides the locust-cloud docker image tag. for internal use
+)
 
 options, locust_options = parser.parse_known_args()
 options: Namespace
@@ -289,6 +296,7 @@ def main() -> None:
                 *locust_env_variables,
             ],
             "worker_count": worker_count,
+            "image_tag": options.image_tag,
         }
         headers = {
             "Authorization": f"Bearer {cognito_client_id_token}",

locust_cloud/timescale/exporter.py

@@ -99,13 +99,15 @@ class Exporter:
     def write_samples_to_db(self, samples):
         try:
             with self.pool.connection() as conn:
-                conn.cursor().executemany(
-                    """
-INSERT INTO requests (time,run_id,greenlet_id,loadgen,name,request_type,response_time,success,response_length,exception,pid,url,context)
-VALUES (%(time)s, %(run_id)s, %(greenlet_id)s, %(loadgen)s, %(name)s, %(request_type)s, %(response_time)s, %(success)s, %(response_length)s, %(exception)s, %(pid)s, %(url)s, %(context)s)
-""",
-                    samples,
-                )
+                conn: psycopg.connection.Connection
+                with conn.cursor() as cur:
+                    cur.executemany(
+                        """
+    INSERT INTO requests (time,run_id,greenlet_id,loadgen,name,request_type,response_time,success,response_length,exception,pid,url,context)
+    VALUES (%(time)s, %(run_id)s, %(greenlet_id)s, %(loadgen)s, %(name)s, %(request_type)s, %(response_time)s, %(success)s, %(response_length)s, %(exception)s, %(pid)s, %(url)s, %(context)s)
+    """,
+                        samples,
+                    )
         except psycopg.Error as error:
             logging.error("Failed to write samples to Postgresql timescale database: " + repr(error))
 

locust_cloud/timescale/query.py

@@ -1,6 +1,4 @@
-import json
 import logging
-import time
 
 from flask import make_response, request
 from locust_cloud.timescale.queries import queries
@@ -15,20 +13,18 @@ def adapt_timestamp(result):
 def register_query(environment, pool):
     @environment.web_ui.app.route("/cloud-stats/<query>", methods=["POST"])
     def query(query):
-        print(query)
         results = []
-
         try:
             if query and queries[query]:
-                start_time = time.perf_counter()
+                # start_time = time.perf_counter()
                 with pool.connection() as conn:
-                    get_conn_time = (time.perf_counter() - start_time) * 1000
+                    # get_conn_time = (time.perf_counter() - start_time) * 1000
                     sql_params = request.get_json()
-                    start_time = time.perf_counter()
+                    # start_time = time.perf_counter()
                     cursor = conn.execute(queries[query], sql_params)
-                    exec_time = (time.perf_counter() - start_time) * 1000
+                    # exec_time = (time.perf_counter() - start_time) * 1000
                     assert cursor
-                    start_time = time.perf_counter()
+                    # start_time = time.perf_counter()
                     results = [
                         adapt_timestamp(
                             dict(
@@ -40,16 +36,10 @@ def register_query(environment, pool):
                         )
                         for row in cursor.fetchall()
                     ]
-                fetch_time = (time.perf_counter() - start_time) * 1000
-
-                logger.info(
-                    f"Executed query '{query}' with params {sql_params}. It took {round(get_conn_time)}+{round(exec_time)}+{round(fetch_time)}ms"
-                )
-                try:
-                    json.dumps(results)
-                except TypeError:
-                    logger.error(f"Could not serialize result: {str(results)[:500]}")
-                    return make_response(f"Could not serialize result: {str(results)[:500]}", 400)
+                # fetch_time = (time.perf_counter() - start_time) * 1000
+                # logger.info(
+                #     f"Executed query '{query}' with params {sql_params}. It took {round(get_conn_time)}+{round(exec_time)}+{round(fetch_time)}ms"
+                # )
                 return results
             else:
                 logger.warning(f"Received invalid query key: '{query}'")

{locust_cloud-1.5.0.dist-info → locust_cloud-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: locust-cloud
-Version: 1.5.0
+Version: 1.5.2
 Summary: Locust Cloud
 Project-URL: Homepage, https://locust.cloud
 Requires-Python: >=3.11

{locust_cloud-1.5.0.dist-info → locust_cloud-1.5.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 locust_cloud/__init__.py,sha256=HbH2uFv-zdVS3PeX1D1RmplyXDGe0rWPmVhbQcmJrdY,2613
 locust_cloud/auth.py,sha256=K57DQ25tfzr97lRbqEH1lz6GITSTXRtXO4JzK4vbVVk,3203
-locust_cloud/cloud.py,sha256=mZJxWClcRod596En1vo_rwJAVZ_nWsSY4vmZFR3AAUY,15732
+locust_cloud/cloud.py,sha256=VSXv5EzIIcmkdbMB-YfMIW0fk9EVZooB1vDxvFQURiM,15991
 locust_cloud/constants.py,sha256=YGgIEnaOT9cAA8F8a8Z8lOmlI78D2fXiVpP0RF213MA,167
 locust_cloud/credential_manager.py,sha256=JbuS22RTGAmngVB9DFLxHIgaonCSImemMGvtWnxBZRE,5515
-locust_cloud/timescale/exporter.py,sha256=iojCxuV9H9yg5O9y3lDdXUq0gOgklUD6JOfV2Pe8hXU,10808
+locust_cloud/timescale/exporter.py,sha256=tx4TPp2gfl0ggA-2CrRTfRlg9ZG1Y31NOXcqiXzqkEw,10921
 locust_cloud/timescale/queries.py,sha256=TjcmWDB9PZSslnKLbUs3o6R9NZ61zV3BSu36XKNensk,5863
-locust_cloud/timescale/query.py,sha256=Aqh-J9v2m2PugRInLT33qrTTf5YChb8Np4BYXOW2xtg,2387
+locust_cloud/timescale/query.py,sha256=Ab3tAZSAeAH2SPBhreVxCNOiVbpq_eKb5xMiCrlsRwk,2078
 locust_cloud/webui/.eslintrc,sha256=huuuTZNwbBGkhfelEOMhLQ-tgC9OYnnX0DRYgBn83Ig,1146
 locust_cloud/webui/.gitignore,sha256=i8EHIqDlVm1-Dkvf_GTZmP_Wu99GE7ABfbYzHXOU734,54
 locust_cloud/webui/.prettierrc,sha256=qZpzAJPlHUQ3--NHYK8WXgc_TlIqq-eoz4pbkTKK3nk,167
@@ -17,7 +17,7 @@ locust_cloud/webui/vite.config.ts,sha256=cqxPMkbwEA3H9mGGbuPulQUhIHCosUqm_1usxzs
 locust_cloud/webui/yarn.lock,sha256=6BC6sHV1ufQeg1s3HoLHC2SwYs6zEVE-NHVg_1kSuVI,227118
 locust_cloud/webui/dist/index.html,sha256=ceT6hvFOq5tHWJGjwPVhlfOgvDzj8kJ1SudRmXQBggc,664
 locust_cloud/webui/dist/assets/index-B-CH83Zq.js,sha256=CbLgdiLRCwxAqGNKyHOQjmll_al3lrXaPPsisboc0S4,2806387
-locust_cloud-1.5.0.dist-info/METADATA,sha256=CU3XaOMBy7yHj5BmShOnA87bTEaW6C3za5d3EjDX9vY,1663
-locust_cloud-1.5.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-locust_cloud-1.5.0.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
-locust_cloud-1.5.0.dist-info/RECORD,,
+locust_cloud-1.5.2.dist-info/METADATA,sha256=u1T_pJTb1vBru95DDkZWtOTySjK7WkMgyW7K97ozGKA,1663
+locust_cloud-1.5.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+locust_cloud-1.5.2.dist-info/entry_points.txt,sha256=PGyAb4e3aTsGS3N3VGShDl6VzJaXy7QwsEgsLOC7V00,57
+locust_cloud-1.5.2.dist-info/RECORD,,