torproject/metrics-web
1
0
Fork 0
mirror of https://github.com/torproject/metrics-web.git synced 2024-11-23 01:29:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to BridgeDB metrics version 2.

Browse Source
This commit is contained in:
Karsten Loesing 2020-06-15 15:42:53 +02:00
parent 80a7f16a43
commit 9a9b848d10
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/torproject/metrics/stats/bridgedb/Main.java
View File

@ -81,8 +81,9 @@ public class Main {
continue;
}
BridgedbMetrics bridgedbMetrics = (BridgedbMetrics) descriptor;
if (!"1".equals(bridgedbMetrics.bridgedbMetricsVersion())) {
logger.warn("Unable to process BridgeDB metrics version {} != 1.",
if (!bridgedbMetrics.bridgedbMetricsVersion().startsWith("1")
&& !bridgedbMetrics.bridgedbMetricsVersion().startsWith("2")) {
logger.warn("Unable to process BridgeDB metrics version {} > 2.",
bridgedbMetrics.bridgedbMetricsVersion());
continue;
}
@ -99,13 +100,17 @@ public class Main {
/* Unable to extract relevant key parts. */
continue;
}
String distributor = keyParts[0];
if (distributor.equals("internal")) {
/* Skip internal metrics added in BridgeDB metrics version 2. */
continue;
}
if (bridgedbMetricCount.getValue() < 10) {
logger.warn("Skipping too small BridgeDB metric count {} < 10 in {}.",
bridgedbMetricCount.getValue(),
descriptor.getDescriptorFile().getAbsolutePath());
continue;
}
String distributor = keyParts[0];
String transport = keyParts[1];
String ccOrEmail = keyParts[2];
if (ccOrEmail.equals("zz")) {