Commit 569bb83f authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Archive snowflake statistics. 

Implements #29461.
parent a8a4961a

CHANGELOG.md

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
     versions resolved by Ivy are the same as in Debian stretch with

     few exceptions.

   - Remove Cobertura from the build process.

   - Archive snowflake statistics.

   - Update to metrics-lib 2.7.0.





# Changes in version 1.9.1 - 2019-05-29

build.xml

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
  <property name="release.version" value="1.9.1-dev" />

  <property name="project-main-class" value="org.torproject.metrics.collector.Main" />

  <property name="name" value="collector"/>

  <property name="metricslibversion" value="2.6.2" />

  <property name="metricslibversion" value="2.7.0" />

  <property name="jarincludes" value="collector.properties logback.xml" />



  <patternset id="runtime" >

src/main/java/org/torproject/metrics/collector/Main.java

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import org.torproject.metrics.collector.exitlists.ExitListDownloader; 
import org.torproject.metrics.collector.indexer.CreateIndexJson;

import org.torproject.metrics.collector.onionperf.OnionPerfDownloader;

import org.torproject.metrics.collector.relaydescs.ArchiveWriter;

import org.torproject.metrics.collector.snowflake.SnowflakeStatsDownloader;

import org.torproject.metrics.collector.webstats.SanitizeWeblogs;



import org.slf4j.Logger;
@@ -53,6 +54,8 @@ public class Main { 
    collecTorMains.put(Key.RelaydescsActivated, ArchiveWriter.class);

    collecTorMains.put(Key.OnionPerfActivated, OnionPerfDownloader.class);

    collecTorMains.put(Key.WebstatsActivated, SanitizeWeblogs.class);

    collecTorMains.put(Key.SnowflakeStatsActivated,

        SnowflakeStatsDownloader.class);

  }



  private static Configuration conf = new Configuration();

src/main/java/org/torproject/metrics/collector/conf/Annotation.java

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ public enum Annotation { 
  Server("@type server-descriptor 1.0\n"),

  Status("@type bridge-network-status 1.2\n"),

  OnionPerf("@type torperf 1.1\n"),

  Vote("@type network-status-vote-3 1.0\n");

  Vote("@type network-status-vote-3 1.0\n"),

  SnowflakeStats("@type snowflake-stats 1.0\n");



  private final String annotation;

  private final byte[] bytes;

src/main/java/org/torproject/metrics/collector/conf/Configuration.java

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class Configuration extends Observable implements Cloneable { 
        || this.getBool(Key.ExitlistsActivated)

        || this.getBool(Key.UpdateindexActivated)

        || this.getBool(Key.OnionPerfActivated)

        || this.getBool(Key.SnowflakeStatsActivated)

        || this.getBool(Key.WebstatsActivated))) {

      throw new ConfigurationException("Nothing is activated!\n"

          + "Please edit collector.properties. Exiting.");