From 3c6566b65f836ffe4890d66bf1f5a0693dab0cca Mon Sep 17 00:00:00 2001
From: Florian Reimair <office@florianreimair.at>
Date: Mon, 21 Jan 2019 18:21:04 +0100
Subject: [PATCH] P2PRtt Metric has configurable Tor proxy port

---
 .../src/main/java/bisq/monitor/metric/P2PRoundTripTime.java | 4 ++--
 monitor/src/main/resources/metrics.properties               | 6 ++++++
 .../src/test/java/bisq/monitor/P2PRoundTripTimeTests.java   | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java b/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java
index d7f7ff005f..566d70302c 100644
--- a/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java
+++ b/monitor/src/main/java/bisq/monitor/metric/P2PRoundTripTime.java
@@ -51,6 +51,7 @@ public class P2PRoundTripTime extends Metric implements MessageListener, SetupLi
 
     private static final String SAMPLE_SIZE = "run.sampleSize";
     private static final String HOSTS = "run.hosts";
+    private static final String TOR_PROXY_PORT = "run.torProxyPort";
     private NetworkNode networkNode;
     private final File torWorkingDirectory = new File("metric_p2pRoundTripTime");
     private int nonce;
@@ -86,8 +87,7 @@ public class P2PRoundTripTime extends Metric implements MessageListener, SetupLi
     @Override
     public void configure(Properties properties) {
         super.configure(properties);
-
-        networkNode = new TorNetworkNode(9052, new CoreNetworkProtoResolver(), false,
+        networkNode = new TorNetworkNode(Integer.parseInt(configuration.getProperty(TOR_PROXY_PORT, "9052")), new CoreNetworkProtoResolver(), false,
                 new NewTor(torWorkingDirectory, "", "", null));
         networkNode.start(this);
     }
diff --git a/monitor/src/main/resources/metrics.properties b/monitor/src/main/resources/metrics.properties
index 482796cd94..5e5a714014 100644
--- a/monitor/src/main/resources/metrics.properties
+++ b/monitor/src/main/resources/metrics.properties
@@ -24,6 +24,12 @@ TorHiddenServiceStartupTime.run.interval=100
 TorHiddenServiceStartupTime.run.localPort=90501
 TorHiddenServiceStartupTime.run.servicePort=90511
 
+#P2PRoundTripTime Metric
+P2PRoundTripTime.enabled=true
+P2PRoundTripTime.run.interval=100
+P2PRoundTripTime.run.sampleSize=5
+P2PRoundTripTime.run.hosts=http://723ljisnynbtdohi.onion:8000, fl3mmribyxgrv63c.onion:8000
+
 #Another Metric
 Another.run.interval=5
 
diff --git a/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java b/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java
index 9db652bcd8..e171af66d1 100644
--- a/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java
+++ b/monitor/src/test/java/bisq/monitor/P2PRoundTripTimeTests.java
@@ -81,6 +81,7 @@ public class P2PRoundTripTimeTests {
             configuration.put("P2PRoundTripTime.run.sampleSize", sampleSize);
         // torproject.org hidden service
         configuration.put("P2PRoundTripTime.run.hosts", "http://expyuzz4wqqyqhjn.onion:80");
+        configuration.put("P2PRoundTripTime.run.torProxyPort", "9052");
 
         Metric DUT = new P2PRoundTripTime(reporter);
         // start