torproject/metrics-web
1
0
Fork 0
mirror of https://github.com/torproject/metrics-web.git synced 2024-12-04 08:37:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switch from OnionPerf's .tpf to .json files.

Browse Source 
Implements #34109.
This commit is contained in:
Karsten Loesing 2020-05-04 09:53:56 +02:00
parent 95d4c5a59b
commit 5cdcfc0180
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -13,7 +13,9 @@
- Estimate bridge users by country based on requests by country, if - Estimate bridge users by country based on requests by country, if
available, to get more accurate numbers than those obtained from available, to get more accurate numbers than those obtained from
unique IP address counts. 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 * Minor changes
- Make Jetty host configurable. - Make Jetty host configurable.

2
build.xml
View File

@ -10,7 +10,7 @@
<property name="javadoc-title" value="MetricsWeb API Documentation"/> <property name="javadoc-title" value="MetricsWeb API Documentation"/>
<property name="implementation-title" value="metrics-web" /> <property name="implementation-title" value="metrics-web" />
<property name="release.version" value="1.3.0-dev" /> <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="exoneratorversion" value="4.4.0" />
<property name="jetty.version" value="-9.2.21.v20170120" /> <property name="jetty.version" value="-9.2.21.v20170120" />
<property name="warfile" <property name="warfile"

2
src/main/java/org/torproject/metrics/stats/collectdescs/Main.java
View File

@ -29,7 +29,7 @@ public class Main {
"/recent/relay-descriptors/extra-infos/", "/recent/relay-descriptors/extra-infos/",
"/recent/relay-descriptors/server-descriptors/", "/recent/relay-descriptors/server-descriptors/",
"/recent/relay-descriptors/votes/", "/recent/relay-descriptors/votes/",
"/recent/torperf/", "/recent/onionperf/",
"/recent/webstats/" "/recent/webstats/"
}, 0L, org.torproject.metrics.stats.main.Main.descriptorsDir, true); }, 0L, org.torproject.metrics.stats.main.Main.descriptorsDir, true);
} }

4
src/main/java/org/torproject/metrics/stats/onionperf/Main.java
View File

@ -97,9 +97,9 @@ public class Main {
DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader(); DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader();
for (Descriptor d : dr.readDescriptors( for (Descriptor d : dr.readDescriptors(
new File(org.torproject.metrics.stats.main.Main.descriptorsDir, new File(org.torproject.metrics.stats.main.Main.descriptorsDir,
"archive/torperf"), "archive/onionperf"),
new File(org.torproject.metrics.stats.main.Main.descriptorsDir, new File(org.torproject.metrics.stats.main.Main.descriptorsDir,
"recent/torperf"))) { "recent/onionperf"))) {
if (!(d instanceof TorperfResult)) { if (!(d instanceof TorperfResult)) {
continue; continue;
} }