Use test id as client.id

Author: emasab

tests/soak/soakclient.py

@@ -428,6 +428,7 @@ def filter_config(conf, filter_out, strip_prefix):
 
         # Create topic (might already exist)
         aconf = filter_config(conf, ["consumer.", "producer."], "admin.")
+        aconf['client.id'] = self.testid
         self.create_topic(self.topic, aconf)
 
         #
@@ -439,13 +440,15 @@ def filter_config(conf, filter_out, strip_prefix):
         # Producer
         pconf = filter_config(conf, ["consumer.", "admin."], "producer.")
         pconf['error_cb'] = self.producer_error_cb
+        pconf['client.id'] = self.testid
         self.producer = Producer(pconf)
 
         # Consumer
         cconf = filter_config(conf, ["producer.", "admin."], "consumer.")
         cconf['error_cb'] = self.consumer_error_cb
         cconf['on_commit'] = self.consumer_commit_cb
         self.logger.info("consumer: using group.id {}".format(cconf['group.id']))
+        cconf['client.id'] = self.testid
         self.consumer = Consumer(cconf)
 
         # Initialize some counters to zero to make them appear in the metrics