Merge pull request #943 from nklincoln/tx-observers

Add txObservers and make use of TXN Stats Collector object
hyperledger-caliper · Aug 12, 2020 · a92ce49 · a92ce49
2 parents c84d59f + bda6a64
commit a92ce49
Show file tree

Hide file tree

Showing 73 changed files with 2,903 additions and 3,007 deletions.
diff --git a/packages/caliper-cli/lib/launch/lib/launchWorker.js b/packages/caliper-cli/lib/launch/lib/launchWorker.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const { CaliperUtils, ConfigUtil, Constants, MessageHandler } = require('@hyperledger/caliper-core');
+const { CaliperUtils, ConfigUtil, Constants, WorkerMessageHandler } = require('@hyperledger/caliper-core');
 const BindCommon = require('./../../lib/bindCommon');
 const logger = CaliperUtils.getLogger('cli-launch-worker');
 
@@ -79,7 +79,7 @@ class LaunchWorker {
          * @type {MessengerInterface}
          */
         const messenger = messengerFactory({});
-        const messageHandler = new MessageHandler(messenger, connectorFactory);
+        const messageHandler = new WorkerMessageHandler(messenger, connectorFactory);
 
         await messenger.initialize();
         await messenger.configureProcessInstances([process]);

diff --git a/packages/caliper-core/index.js b/packages/caliper-core/index.js
@@ -21,7 +21,7 @@ module.exports.TxStatus = require('./lib/common/core/transaction-status');
 module.exports.CaliperUtils = require('./lib/common/utils/caliper-utils');
 module.exports.Version = require('./lib/common/utils/version');
 module.exports.ConfigUtil = require('./lib/common/config/config-util');
-module.exports.MessageHandler = require('./lib/worker/message-handler');
+module.exports.WorkerMessageHandler = require('./lib/worker/worker-message-handler');
 module.exports.MessengerInterface = require('./lib/common/messengers/messenger-interface');
 module.exports.CaliperEngine = require('./lib/manager/caliper-engine');
 module.exports.MonitorOrchestrator = require('./lib/manager/orchestrators/monitor-orchestrator');

diff --git a/packages/caliper-core/lib/common/config/Config.js b/packages/caliper-core/lib/common/config/Config.js
@@ -37,13 +37,22 @@ const keys = {
             Transparency: 'caliper-report-charting-transparency'
         }
     },
+    Progress: {
+        Reporting: {
+            Enabled: 'caliper-progress-reporting-enabled',
+            Interval: 'caliper-progress-reporting-interval'
+        }
+    },
+    Monitor: {
+        DefaultInterval: 'caliper-monitor-default-interval'
+    },
     Workspace: 'caliper-workspace',
     ProjectConfig: 'caliper-projectconfig',
     UserConfig: 'caliper-userconfig',
     MachineConfig: 'caliper-machineconfig',
     BenchConfig: 'caliper-benchconfig',
     NetworkConfig: 'caliper-networkconfig',
-    TxUpdateTime: 'caliper-txupdatetime',
+    MonitorConfig: 'caliper-monitorconfig',
     LoggingRoot: 'caliper-logging',
     Logging: {
         Template: 'caliper-logging-template',
@@ -92,7 +101,9 @@ const keys = {
             Method: 'caliper-worker-communication-method',
             Address: 'caliper-worker-communication-address',
         },
-        MaxTxPromises: 'caliper-worker-maxtxpromises'
+        Update: {
+            Interval: 'caliper-worker-update-interval'
+        }
     },
     Flow: {
         Skip: {

diff --git a/packages/caliper-core/lib/common/config/default.yaml b/packages/caliper-core/lib/common/config/default.yaml
@@ -50,8 +50,18 @@ caliper:
     benchconfig:
     # Path to the blockchain configuration file that contains information required to interact with the SUT
     networkconfig:
-    # Sets the frequency of the progress reports in milliseconds
-    txupdatetime: 5000
+    # Configurations related to caliper test progress
+    progress:
+        # Progress reports
+        reporting:
+            # Enable the reporting action
+            enabled: true
+            # Reporting frequency
+            interval: 5000
+    # Configurations related to caliper test monitors
+    monitor:
+        # Default update interval
+        defaultinterval: 5000
     # Configurations related to the logging mechanism
     logging:
         # Specifies the message structure through placeholders
@@ -114,15 +124,16 @@ caliper:
     worker:
         # Indicate if workers are in distributed mode
         remote: false
-        # Polling interval to use once created, in milliseconds
-        pollinterval: 5000
         # Worker communication details
         communication:
             # Method used (process | mqtt)
             method: process
             # Address used for mqtt communications
             address: mqtt://localhost:1883
-        maxtxpromises: 100
+        # Worker update configuration
+        update:
+            # update interval for sending round statistics to the manager
+            interval: 1000
     # Caliper flow options
     flow:
         # Skip options