From 330f2762ef31630cc1afc61b702930f471dd64a0 Mon Sep 17 00:00:00 2001 From: Alex Gap Date: Fri, 7 Oct 2022 10:31:45 -0700 Subject: [PATCH 1/2] switch back to diag --- dashboards/engine-stats.json | 42 ++++++++-------- dashboards/message-stats.json | 54 ++++++++++----------- dashboards/time-to-first-payment.json | 70 +++++++++++++-------------- tests/virtual-payment.go | 10 ++-- 4 files changed, 88 insertions(+), 88 deletions(-) diff --git a/dashboards/engine-stats.json b/dashboards/engine-stats.json index 3556abd6..1bda81d4 100644 --- a/dashboards/engine-stats.json +++ b/dashboards/engine-stats.json @@ -123,7 +123,7 @@ "type": "time" } ], - "measurement": "results.go-nitro-testground-virtual-payment.executeSideEffects.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.executeSideEffects.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -171,7 +171,7 @@ } ], "hide": true, - "measurement": "results.go-nitro-testground-virtual-payment.handleMessage.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.handleMessage.timer", "orderByTime": "ASC", "policy": "default", "refId": "B", @@ -219,7 +219,7 @@ } ], "hide": true, - "measurement": "results.go-nitro-testground-virtual-payment.handleObjectiveRequest.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.handleObjectiveRequest.timer", "orderByTime": "ASC", "policy": "default", "refId": "C", @@ -267,7 +267,7 @@ } ], "hide": true, - "measurement": "results.go-nitro-testground-virtual-payment.attemptProgress.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.attemptProgress.timer", "orderByTime": "ASC", "policy": "default", "refId": "D", @@ -315,10 +315,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.sendMessages.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.sendMessages.timer", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"mean\") FROM \"results.go-nitro-testground-virtual-payment.sendMessages.timer\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY time(1s) fill(linear)", + "query": "SELECT mean(\"mean\") FROM \"diagnostics.go-nitro-testground-virtual-payment.sendMessages.timer\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY time(1s) fill(linear)", "rawQuery": false, "refId": "E", "resultFormat": "time_series", @@ -440,7 +440,7 @@ "type": "tag" } ], - "measurement": "results.go-nitro-testground-virtual-payment.attemptProgress.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.attemptProgress.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -571,7 +571,7 @@ "type": "fill" } ], - "measurement": "results.go-nitro-testground-virtual-payment.executeSideEffects.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.executeSideEffects.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -694,7 +694,7 @@ "type": "tag" } ], - "measurement": "results.go-nitro-testground-virtual-payment.handleMessage.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.handleMessage.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -813,7 +813,7 @@ "type": "tag" } ], - "measurement": "results.go-nitro-testground-virtual-payment.messages_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.messages_queue.gauge", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -851,10 +851,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.proposal_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -891,10 +891,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.api_objective_request_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.api_objective_request_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "C", "resultFormat": "time_series", @@ -931,10 +931,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.api_payment_request_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.api_payment_request_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "D", "resultFormat": "time_series", @@ -971,10 +971,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.chain_events_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.chain_events_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "E", "resultFormat": "time_series", @@ -1104,7 +1104,7 @@ "type": "fill" } ], - "measurement": "results.go-nitro-testground-virtual-payment.handleObjectiveRequest.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.handleObjectiveRequest.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -1152,13 +1152,13 @@ "type": "influxdb", "uid": "n3gdqUn4k" }, - "definition": " select run,mean from \"results.go-nitro-testground-virtual-payment.handleMessage.timer\" WHERE $timeFilter ", + "definition": " select run,mean from \"diagnostics.go-nitro-testground-virtual-payment.handleMessage.timer\" WHERE $timeFilter ", "hide": 0, "includeAll": false, "multi": false, "name": "runId", "options": [], - "query": " select run,mean from \"results.go-nitro-testground-virtual-payment.handleMessage.timer\" WHERE $timeFilter ", + "query": " select run,mean from \"diagnostics.go-nitro-testground-virtual-payment.handleMessage.timer\" WHERE $timeFilter ", "refresh": 2, "regex": "", "skipUrlSync": false, diff --git a/dashboards/message-stats.json b/dashboards/message-stats.json index e3284a35..40f21523 100644 --- a/dashboards/message-stats.json +++ b/dashboards/message-stats.json @@ -179,10 +179,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.msg_size.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.msg_size.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"sebder\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"sebder\"", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -302,10 +302,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.msg_size.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.msg_size.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"receiver\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"receiver\"", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -425,7 +425,7 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.msg_proposal_count.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.msg_proposal_count.gauge", "orderByTime": "ASC", "policy": "default", "refId": "B", @@ -546,7 +546,7 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.msg_proposal_count.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.msg_proposal_count.gauge", "orderByTime": "ASC", "policy": "default", "refId": "B", @@ -663,7 +663,7 @@ "type": "tag" } ], - "measurement": "results.go-nitro-testground-virtual-payment.messages_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.messages_queue.gauge", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -697,13 +697,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "select run,value FROM \"results.go-nitro-testground-virtual-payment.msg_size.gauge\" where $timeFilter", + "definition": "select run,value FROM \"diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge\" where $timeFilter", "hide": 0, "includeAll": false, "multi": false, "name": "runId", "options": [], - "query": "select run,value FROM \"results.go-nitro-testground-virtual-payment.msg_size.gauge\" where $timeFilter", + "query": "select run,value FROM \"diagnostics.go-nitro-testground-virtual-payment.msg_size.gauge\" where $timeFilter", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -716,13 +716,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT concurrentJobs, value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", + "definition": "SELECT concurrentJobs, value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "jobCount", "options": [], - "query": "SELECT concurrentJobs, value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", + "query": "SELECT concurrentJobs, value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -735,13 +735,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"duration\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"duration\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "testDuration", "options": [], - "query": "SELECT \"duration\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"duration\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -754,13 +754,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"hubs\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"hubs\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "hubs", "options": [], - "query": "SELECT \"hubs\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"hubs\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -773,13 +773,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payees\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payees\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payees", "options": [], - "query": "SELECT \"payees\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payees\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -792,13 +792,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"jitter\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"jitter\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "jitter", "options": [], - "query": "SELECT \"jitter\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"jitter\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -811,13 +811,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"latency\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"latency\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "latency", "options": [], - "query": "SELECT \"latency\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"latency\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -830,13 +830,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payers", "options": [], - "query": "SELECT \"payers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 1, "regex": "", "skipUrlSync": false, @@ -849,13 +849,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payeePayers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payeePayers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payeepayers", "options": [], - "query": "SELECT \"payeePayers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payeePayers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -868,13 +868,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"nitroVersion\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"nitroVersion\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "nitroVersion", "options": [], - "query": "SELECT \"nitroVersion\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"nitroVersion\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, diff --git a/dashboards/time-to-first-payment.json b/dashboards/time-to-first-payment.json index 64a0f841..c9232ef7 100644 --- a/dashboards/time-to-first-payment.json +++ b/dashboards/time-to-first-payment.json @@ -159,7 +159,7 @@ "type": "time" } ], - "measurement": "results.go-nitro-testground-virtual-payment.time_to_first_payment.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -298,10 +298,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.objective_complete_time.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.objective_complete_time.timer", "orderByTime": "ASC", "policy": "default", - "query": "SELECT mean(\"mean\") FROM \"results.go-nitro-testground-virtual-payment.objective_complete_time.timer\" WHERE (\"run\" =~ /^$runId$/ AND \"type\" = 'VirtualFund' AND $timeFilter GROUP BY time($__interval), \"wallet\" fill(none)", + "query": "SELECT mean(\"mean\") FROM \"diagnostics.go-nitro-testground-virtual-payment.objective_complete_time.timer\" WHERE (\"run\" =~ /^$runId$/ AND \"type\" = 'VirtualFund' AND $timeFilter GROUP BY time($__interval), \"wallet\" fill(none)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -469,7 +469,7 @@ "type": "fill" } ], - "measurement": "results.go-nitro-testground-virtual-payment.time_to_first_payment.timer", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -592,7 +592,7 @@ "type": "tag" } ], - "measurement": "results.go-nitro-testground-virtual-payment.messages_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.messages_queue.gauge", "orderByTime": "ASC", "policy": "default", "refId": "A", @@ -630,10 +630,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.proposal_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": true, "refId": "B", "resultFormat": "time_series", @@ -670,10 +670,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.api_objective_request_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.api_objective_request_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "C", "resultFormat": "time_series", @@ -710,10 +710,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.api_payment_request_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.api_payment_request_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "D", "resultFormat": "time_series", @@ -750,10 +750,10 @@ } ], "hide": false, - "measurement": "results.go-nitro-testground-virtual-payment.chain_events_queue.gauge", + "measurement": "diagnostics.go-nitro-testground-virtual-payment.chain_events_queue.gauge", "orderByTime": "ASC", "policy": "default", - "query": "SELECT \"value\" FROM \"results.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", + "query": "SELECT \"value\" FROM \"diagnostics.go-nitro-testground-virtual-payment.proposal_queue.gauge\" WHERE (\"run\" =~ /^$runId$/) AND $timeFilter GROUP BY \"wallet\"", "rawQuery": false, "refId": "E", "resultFormat": "time_series", @@ -792,13 +792,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "select run,count FROM \"results.go-nitro-testground-virtual-payment.time_to_first_payment.timer\" where $timeFilter", + "definition": "select run,count FROM \"diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer\" where $timeFilter", "hide": 0, "includeAll": false, "multi": false, "name": "runId", "options": [], - "query": "select run,count FROM \"results.go-nitro-testground-virtual-payment.time_to_first_payment.timer\" where $timeFilter", + "query": "select run,count FROM \"diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer\" where $timeFilter", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -811,13 +811,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT concurrentJobs, value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", + "definition": "SELECT concurrentJobs, value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "jobCount", "options": [], - "query": "SELECT concurrentJobs, value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", + "query": "SELECT concurrentJobs, value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run = '$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -830,13 +830,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"duration\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"duration\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "testDuration", "options": [], - "query": "SELECT \"duration\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"duration\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -849,13 +849,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"hubs\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"hubs\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "hubs", "options": [], - "query": "SELECT \"hubs\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"hubs\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -868,13 +868,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payees\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payees\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payees", "options": [], - "query": "SELECT \"payees\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payees\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -887,13 +887,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"jitter\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"jitter\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "jitter", "options": [], - "query": "SELECT \"jitter\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"jitter\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -906,13 +906,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"latency\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"latency\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "latency", "options": [], - "query": "SELECT \"latency\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"latency\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -926,13 +926,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": " \"SELECT \\\"me\\\",count FROM \\\"results.go-nitro-testground-virtual-payment.time_to_first_payment.timer\\\" where run='$runId'\"", + "definition": " \"SELECT \\\"me\\\",count FROM \\\"diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer\\\" where run='$runId'\"", "hide": 2, "includeAll": false, "multi": true, "name": "clientAdds", "options": [], - "query": " \"SELECT \\\"me\\\",count FROM \\\"results.go-nitro-testground-virtual-payment.time_to_first_payment.timer\\\" where run='$runId'\"", + "query": " \"SELECT \\\"me\\\",count FROM \\\"diagnostics.go-nitro-testground-virtual-payment.time_to_first_payment.timer\\\" where run='$runId'\"", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -945,13 +945,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payers", "options": [], - "query": "SELECT \"payers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -964,13 +964,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"payeePayers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"payeePayers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "payeepayers", "options": [], - "query": "SELECT \"payeePayers\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"payeePayers\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, @@ -983,13 +983,13 @@ "type": "influxdb", "uid": "${DS_INFLUXDB}" }, - "definition": "SELECT \"nitroVersion\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "definition": "SELECT \"nitroVersion\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "hide": 2, "includeAll": false, "multi": false, "name": "nitroVersion", "options": [], - "query": "SELECT \"nitroVersion\",value FROM \"results.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", + "query": "SELECT \"nitroVersion\",value FROM \"diagnostics.go-nitro-testground-virtual-payment.run_info.point\" where run='$runId'", "refresh": 2, "regex": "", "skipUrlSync": false, diff --git a/tests/virtual-payment.go b/tests/virtual-payment.go index 283050eb..7285a4da 100644 --- a/tests/virtual-payment.go +++ b/tests/virtual-payment.go @@ -71,7 +71,7 @@ func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) err runEnv.RecordMessage("I am address:%s role:%d seq:%d", me.Address, me.Role, me.Seq) - utils.RecordRunInfo(me, runConfig, runEnv.R()) + utils.RecordRunInfo(me, runConfig, runEnv.D()) // Broadcasts our info and get peer info from all other instances. peers := utils.SharePeerInfo(me.PeerInfo, ctx, client, runEnv.TestInstanceCount) @@ -94,7 +94,7 @@ func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) err client.MustSignalEntry(ctx, contractSetup) client.MustBarrier(ctx, contractSetup, runEnv.TestInstanceCount) - nClient := nitro.New(ms, cs, store, logDestination, &engine.PermissivePolicy{}, runEnv.R()) + nClient := nitro.New(ms, cs, store, logDestination, &engine.PermissivePolicy{}, runEnv.D()) cm := utils.NewCompletionMonitor(&nClient, runEnv.RecordMessage) defer cm.Close() @@ -149,7 +149,7 @@ func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) err runEnv.RecordMessage("Sent payment of %d wei to %s using channel %s", paymentAmount.Int64(), utils.Abbreviate(randomPayee.Address), utils.Abbreviate(channelId)) // TODO: Should we wait for receipt of this payment before stopping the time_to_first_payment timer? - runEnv.R().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).UpdateSince(ttfpStart) + runEnv.D().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).UpdateSince(ttfpStart) // Perform between 1 and 5 payments additional payments amountOfPayments := 1 + rand.Intn(4) for i := 0; i < amountOfPayments; i++ { @@ -174,7 +174,7 @@ func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) err // Run the job(s) utils.RunJobs(createVirtualPaymentsJob, runConfig.PaymentTestDuration, int64(runConfig.ConcurrentPaymentJobs)) - runEnv.R().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).Stop() + runEnv.D().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).Stop() toSleep := runConfig.GetSleepDuration() runEnv.RecordMessage("Waiting %s before closing ledger channels", toSleep) time.Sleep(toSleep) @@ -199,7 +199,7 @@ func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) err // This allows us to track performance over time // We restrict this to the payer to avoid inserting time_to_first_payment metrics for every client if me.IsPayer() { - mean := runEnv.R().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).Mean() + mean := runEnv.D().Timer(fmt.Sprintf("time_to_first_payment,me=%s", me.Address)).Mean() if runEnv.BooleanParam("isNightly") { runEnv.R().RecordPoint(fmt.Sprintf("nightly_mean_time_to_first_payment,me=%s", me.Address), float64(mean)) } From ec295f21f7c7915607cecb710a0ab4acd1f01fd9 Mon Sep 17 00:00:00 2001 From: Alex Gap Date: Fri, 7 Oct 2022 10:41:43 -0700 Subject: [PATCH 2/2] up frequency --- tests/virtual-payment.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virtual-payment.go b/tests/virtual-payment.go index 7285a4da..6e0481ab 100644 --- a/tests/virtual-payment.go +++ b/tests/virtual-payment.go @@ -29,7 +29,9 @@ import ( const START_PORT = 49000 func CreateVirtualPaymentTest(runEnv *runtime.RunEnv, init *run.InitContext) error { - + // The default frequency of diagnostics is 10 seconds. + // That's a bit too slow for most of our test runs. + runEnv.D().SetFrequency(1 * time.Second) ctx := context.Background() client := init.SyncClient