locust-plugins 4.4.2__tar.gz → 4.4.4__tar.gz

locust_plugins-4.4.4/CONTRIBUTING.md

@@ -0,0 +1,12 @@
+Contributing Guidelines
+=======================
+
+If you want to talk about a contribution before you start writing code & making a pull request, please [file an issue](https://github.com/SvenskaSpel/locust-plugins/issues/new). You can also find me (cyberwiz) semi-regularly on the official locust [slack](https://locustio.slack.com) [(signup)](https://communityinviter.com/apps/locustio/locust)
+
+In order to maintain a good level of quality, please ensure that your code:
+
+* Is formatted using black (https://github.com/psf/black)
+
+* Passes linting with pylint (https://www.pylint.org/)
+
+* Has relevant examples [here](examples/)

{locust-plugins-4.4.2/locust_plugins.egg-info → locust_plugins-4.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust-plugins
-Version: 4.4.2
+Version: 4.4.4
 Summary: Useful plugins/extensions for Locust
 Home-page: https://github.com/SvenskaSpel/locust-plugins
 Author: Lars Holmberg
@@ -35,7 +35,7 @@ Requires-Dist: confluent-kafka; extra == "kafka"
 Provides-Extra: mongo
 Requires-Dist: pymongo; extra == "mongo"
 Provides-Extra: mqtt
-Requires-Dist: paho-mqtt>=1.5.0; extra == "mqtt"
+Requires-Dist: paho-mqtt>=2.1.0; extra == "mqtt"
 Provides-Extra: appinsights
 Requires-Dist: opencensus-ext-azure; extra == "appinsights"
 Provides-Extra: resource
@@ -49,7 +49,7 @@ Requires-Dist: psycogreen; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: confluent-kafka; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: paho-mqtt>=1.5.0; extra == "all"
+Requires-Dist: paho-mqtt>=2.1.0; extra == "all"
 Requires-Dist: opencensus-ext-azure; extra == "all"
 Requires-Dist: lxml; extra == "all"
 Requires-Dist: boto3; extra == "all"

{locust-plugins-4.4.2 → locust_plugins-4.4.4}/locust_plugins/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.4.2'
-__version_tuple__ = version_tuple = (4, 4, 2)
+__version__ = version = '4.4.4'
+__version_tuple__ = version_tuple = (4, 4, 4)

{locust-plugins-4.4.2 → locust_plugins-4.4.4}/locust_plugins/listeners/timescale.py

@@ -1,4 +1,3 @@
-# See timescale_listener_ex.py for documentation
 from contextlib import contextmanager
 from locust.exception import CatchResponseError  # need to do this first to make sure monkey patching is done
 import json
@@ -75,7 +74,7 @@ class Timescale:  # pylint: disable=R0902
 
     def set_run_id(self, environment, msg, **kwargs):
         logging.debug(f"run id from master: {msg.data}")
-        self._run_id = datetime.strptime(msg.data, "%Y-%m-%d, %H:%M:%S.%f").replace(tzinfo=timezone.utc)
+        environment._run_id = datetime.strptime(msg.data, "%Y-%m-%d, %H:%M:%S.%f").replace(tzinfo=timezone.utc)
 
     @contextmanager
     def dbcursor(self):
@@ -131,11 +130,11 @@ class Timescale:  # pylint: disable=R0902
         self.set_gitrepo()
 
         if not self.env.parsed_options.worker:
-            self._run_id = datetime.now(timezone.utc)
+            environment._run_id = datetime.now(timezone.utc)
             logging.info(
-                f"Follow test run here: {self.env.parsed_options.grafana_url}&var-testplan={self._testplan}&from={int(self._run_id.timestamp()*1000)}&to=now"
+                f"Follow test run here: {self.env.parsed_options.grafana_url}&var-testplan={self._testplan}&from={int(environment._run_id.timestamp()*1000)}&to=now"
             )
-            msg = self._run_id.strftime("%Y-%m-%d, %H:%M:%S.%f")
+            msg = environment._run_id.strftime("%Y-%m-%d, %H:%M:%S.%f")
             if environment.runner is not None:
                 logging.debug(f"about to send run_id to workers: {msg}")
                 environment.runner.send_message("run_id", msg)
@@ -143,6 +142,9 @@ class Timescale:  # pylint: disable=R0902
             self._user_count_logger = gevent.spawn(self._log_user_count)
 
     def _dbconn(self) -> psycopg2.extensions.connection:
+        logging.debug(
+            f"Connecting to Postgres ({self.env.parsed_options.pguser}@{self.env.parsed_options.pghost}:{self.env.parsed_options.pgport or 5432})"
+        )
         try:
             conn = psycopg2.connect(
                 host=self.env.parsed_options.pghost,
@@ -171,7 +173,7 @@ class Timescale:  # pylint: disable=R0902
                 with self.dbcursor() as cur:
                     cur.execute(
                         """INSERT INTO user_count(time, run_id, testplan, user_count) VALUES (%s, %s, %s, %s)""",
-                        (datetime.now(timezone.utc), self._run_id, self._testplan, self.env.runner.user_count),
+                        (datetime.now(timezone.utc), self.env._run_id, self._testplan, self.env.runner.user_count),
                     )
             except psycopg2.Error as error:
                 logging.error("Failed to write user count to Postgresql: " + repr(error))
@@ -239,7 +241,7 @@ class Timescale:  # pylint: disable=R0902
         greenlet_id = getattr(greenlet.getcurrent(), "minimal_ident", 0)  # if we're debugging there is no greenlet
         sample = {
             "time": time,
-            "run_id": self._run_id,
+            "run_id": self.env._run_id,
             "greenlet_id": greenlet_id,
             "loadgen": self._hostname,
             "name": name,
@@ -276,7 +278,7 @@ class Timescale:  # pylint: disable=R0902
             cur.execute(
                 "INSERT INTO testrun (id, testplan, num_clients, rps, description, env, profile_name, username, gitrepo, changeset_guid, arguments) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)",
                 (
-                    self._run_id,
+                    self.env._run_id,
                     self._testplan,
                     self.env.parsed_options.num_users or 1,
                     self.env.parsed_options.ips,  # this field is incorrectly called "rps" in db, it should be called something like "target_ips"
@@ -309,7 +311,7 @@ class Timescale:  # pylint: disable=R0902
                 )
 
     def log_stop_test_run(self, exit_code=None):
-        logging.debug(f"Test run id {self._run_id} stopping")
+        logging.debug(f"Test run id {self.env._run_id} stopping")
         if self.env.parsed_options.worker:
             return  # only run on master or standalone
         if getattr(self, "dbconn", None) is None:
@@ -319,7 +321,7 @@ class Timescale:  # pylint: disable=R0902
             with self.dbcursor() as cur:
                 cur.execute(
                     "UPDATE testrun SET end_time = %s, exit_code = %s where id = %s",
-                    (end_time, exit_code, self._run_id),
+                    (end_time, exit_code, self.env._run_id),
                 )
                 cur.execute(
                     "INSERT INTO events (time, text) VALUES (%s, %s)",
@@ -344,7 +346,7 @@ SET (requests, resp_time_avg, rps_avg, fail_ratio) =
  COUNT(*)::numeric AS fails 
  FROM request WHERE run_id = %s AND time > %s AND success = 0) AS ___
 WHERE id = %s""",
-                        [self._run_id] * 7,
+                        [self.env._run_id] * 7,
                     )
                 except psycopg2.errors.DivisionByZero:  # pylint: disable=no-member
                     logging.info(
@@ -356,5 +358,5 @@ WHERE id = %s""",
                 + repr(error)
             )
         logging.info(
-            f"Report: {self.env.parsed_options.grafana_url}&var-testplan={self._testplan}&from={int(self._run_id.timestamp()*1000)}&to={int((end_time.timestamp()+1)*1000)}\n"
+            f"Report: {self.env.parsed_options.grafana_url}&var-testplan={self._testplan}&from={int(self.env._run_id.timestamp()*1000)}&to={int((end_time.timestamp()+1)*1000)}\n"
         )

{locust-plugins-4.4.2 → locust_plugins-4.4.4/locust_plugins.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust-plugins
-Version: 4.4.2
+Version: 4.4.4
 Summary: Useful plugins/extensions for Locust
 Home-page: https://github.com/SvenskaSpel/locust-plugins
 Author: Lars Holmberg
@@ -35,7 +35,7 @@ Requires-Dist: confluent-kafka; extra == "kafka"
 Provides-Extra: mongo
 Requires-Dist: pymongo; extra == "mongo"
 Provides-Extra: mqtt
-Requires-Dist: paho-mqtt>=1.5.0; extra == "mqtt"
+Requires-Dist: paho-mqtt>=2.1.0; extra == "mqtt"
 Provides-Extra: appinsights
 Requires-Dist: opencensus-ext-azure; extra == "appinsights"
 Provides-Extra: resource
@@ -49,7 +49,7 @@ Requires-Dist: psycogreen; extra == "all"
 Requires-Dist: psycopg2-binary; extra == "all"
 Requires-Dist: confluent-kafka; extra == "all"
 Requires-Dist: pymongo; extra == "all"
-Requires-Dist: paho-mqtt>=1.5.0; extra == "all"
+Requires-Dist: paho-mqtt>=2.1.0; extra == "all"
 Requires-Dist: opencensus-ext-azure; extra == "all"
 Requires-Dist: lxml; extra == "all"
 Requires-Dist: boto3; extra == "all"

{locust-plugins-4.4.2 → locust_plugins-4.4.4}/locust_plugins.egg-info/requires.txt

@@ -8,7 +8,7 @@ psycogreen
 psycopg2-binary
 confluent-kafka
 pymongo
-paho-mqtt>=1.5.0
+paho-mqtt>=2.1.0
 opencensus-ext-azure
 lxml
 boto3
@@ -30,7 +30,7 @@ confluent-kafka
 pymongo
 
 [mqtt]
-paho-mqtt>=1.5.0
+paho-mqtt>=2.1.0
 
 [playwright]
 playwright>=1.40.0

{locust-plugins-4.4.2 → locust_plugins-4.4.4}/setup.py

@@ -10,7 +10,7 @@ extras = {
     "dashboards": ["psycogreen", "psycopg2-binary"],
     "kafka": ["confluent-kafka"],
     "mongo": ["pymongo"],
-    "mqtt": ["paho-mqtt>=1.5.0"],
+    "mqtt": ["paho-mqtt>=2.1.0"],
     "appinsights": ["opencensus-ext-azure"],
     "resource": ["lxml"],
     "boto3": ["boto3"],

locust-plugins-4.4.2/CONTRIBUTING.md

@@ -1,30 +0,0 @@
-Contributing Guidelines
-=======================
-
-If you want to talk about a contribution before you start writing code & making a pull request, please [file an issue](https://github.com/SvenskaSpel/locust-plugins/issues/new). You can also find me (cyberwiz) semi-regularly on the official locust [slack](https://locustio.slack.com).
-
-In order to maintain a good level of quality, please ensure that your code:
-
-* Is formatted using black (https://github.com/psf/black)
-
-* Passes linting with pylint (https://www.pylint.org/)
-
-* Has relevant examples [here](examples/)
-
----
-## environment setup
-
-This project has a dev container definition - https://code.visualstudio.com/docs/remote/containers#
-
-If you have Docker and visual studio code installed all you need to do is open the repository in vs code and select "re-open in container" in the popup that appears in the bottom right. Dependencies and plugins will be automatically handled.
-
-
-### Tusk runner
-
-The development image has some quality of life scripts baked into it
-
-1. running `tusk format` Will run the black formatter on examples/ and locust_plugins/
-
-2. `tusk pylint` will run pylint against on examples/ and locust_plugins/
-
-3. `tusk test` will run the tox test suite in the 3.9 environment