commit 5cdcfc0180cbb7d15e4226d229f11abbb75074b5 Author: Karsten Loesing <karsten.loesing@gmx.net> Date: Mon May 4 09:53:56 2020 +0200 Switch from OnionPerf's .tpf to .json files. Implements #34109. --- CHANGELOG.md | 4 +++- build.xml | 2 +- src/main/java/org/torproject/metrics/stats/collectdescs/Main.java | 2 +- src/main/java/org/torproject/metrics/stats/onionperf/Main.java | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abef5bd..0e23889 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,9 @@ - Estimate bridge users by country based on requests by country, if available, to get more accurate numbers than those obtained from unique IP address counts. - - Update to metrics-lib 2.11.0 and ExoneraTor 4.4.0. + - Update to metrics-lib 2.12.2 and ExoneraTor 4.4.0. + - Switch from processing Torperf .tpf to OnionPerf analysis .json + files. * Minor changes - Make Jetty host configurable. diff --git a/build.xml b/build.xml index d407c33..422f969 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="javadoc-title" value="MetricsWeb API Documentation"/> <property name="implementation-title" value="metrics-web" /> <property name="release.version" value="1.3.0-dev" /> - <property name="metricslibversion" value="2.11.0" /> + <property name="metricslibversion" value="2.12.2" /> <property name="exoneratorversion" value="4.4.0" /> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java index ca7a9b3..1679627 100644 --- a/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java +++ b/src/main/java/org/torproject/metrics/stats/collectdescs/Main.java @@ -29,7 +29,7 @@ public class Main { "/recent/relay-descriptors/extra-infos/", "/recent/relay-descriptors/server-descriptors/", "/recent/relay-descriptors/votes/", - "/recent/torperf/", + "/recent/onionperf/", "/recent/webstats/" }, 0L, org.torproject.metrics.stats.main.Main.descriptorsDir, true); } diff --git a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java index e1b063c..56a689b 100644 --- a/src/main/java/org/torproject/metrics/stats/onionperf/Main.java +++ b/src/main/java/org/torproject/metrics/stats/onionperf/Main.java @@ -97,9 +97,9 @@ public class Main { DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); for (Descriptor d : dr.readDescriptors( new File(org.torproject.metrics.stats.main.Main.descriptorsDir, - "archive/torperf"), + "archive/onionperf"), new File(org.torproject.metrics.stats.main.Main.descriptorsDir, - "recent/torperf"))) { + "recent/onionperf"))) { if (!(d instanceof TorperfResult)) { continue; }