November 2019 - tor-commits - lists.torproject.org

[metrics-lib/master] Bump version to 2.9.1-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 87d998c542688c7e465486de24ef07c1cbece0b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:30:02 2019 +0100 Bump version to 2.9.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd361d..1cf59e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.?.? - 2019-1?-?? + + # Changes in version 2.9.1 - 2019-11-09 * Minor changes diff --git a/build.xml b/build.xml index 0f8ac3c..9c3869a 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.1" /> + <property name="release.version" value="2.9.1-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Bump version to 2.9.0-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 8763af44465445b2257f9740d4ce341f8334eead Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 1 09:17:42 2019 +0100 Bump version to 2.9.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab5c711..99048e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 2.?.? - 2019-1?-?? + + # Changes in version 2.9.0 - 2019-11-01 * Medium changes diff --git a/build.xml b/build.xml index ff5db58..cbf4c8d 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.0" /> + <property name="release.version" value="2.9.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Ignore unknown fields in index.json.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit fba9137499ef6255f040d134f488403cae214793 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:20:36 2019 +0100 Ignore unknown fields in index.json. This is required for processing index.json files produced by CollecTor 1.13.0 or higher. We don't need those newly added fields or any other fields added in the future. But we must not fail when fields are added. --- CHANGELOG.md | 5 ++++- src/main/java/org/torproject/descriptor/index/IndexNode.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99048e8..2fd361d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 2.?.? - 2019-1?-?? +# Changes in version 2.9.1 - 2019-11-09 + + * Minor changes + - Do not fail when processing index.json files with unknown fields. # Changes in version 2.9.0 - 2019-11-01 diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index b6855e3..9136b65 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; @@ -54,7 +55,8 @@ public class IndexNode { .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) .setSerializationInclusion(JsonInclude.Include.NON_EMPTY) .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) - .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); /** The created date-time is exposed in JSON as 'index_created' field. */ @JsonProperty("index_created")

1 0

[metrics-lib/release] Prepare for 2.9.1 release.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 6c8470a0b79a5262162898087a5aa126f366f51e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:25:11 2019 +0100 Prepare for 2.9.1 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index cbf4c8d..0f8ac3c 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.0-dev" /> + <property name="release.version" value="2.9.1" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/master] Ignore unknown fields in index.json.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit fba9137499ef6255f040d134f488403cae214793 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:20:36 2019 +0100 Ignore unknown fields in index.json. This is required for processing index.json files produced by CollecTor 1.13.0 or higher. We don't need those newly added fields or any other fields added in the future. But we must not fail when fields are added. --- CHANGELOG.md | 5 ++++- src/main/java/org/torproject/descriptor/index/IndexNode.java | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99048e8..2fd361d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ -# Changes in version 2.?.? - 2019-1?-?? +# Changes in version 2.9.1 - 2019-11-09 + + * Minor changes + - Do not fail when processing index.json files with unknown fields. # Changes in version 2.9.0 - 2019-11-01 diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index b6855e3..9136b65 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; @@ -54,7 +55,8 @@ public class IndexNode { .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) .setSerializationInclusion(JsonInclude.Include.NON_EMPTY) .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) - .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); /** The created date-time is exposed in JSON as 'index_created' field. */ @JsonProperty("index_created")

1 0

[metrics-lib/master] Prepare for 2.9.1 release.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 6c8470a0b79a5262162898087a5aa126f366f51e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 12:25:11 2019 +0100 Prepare for 2.9.1 release. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index cbf4c8d..0f8ac3c 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <project default="usage" name="metrics-lib" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant"> - <property name="release.version" value="2.9.0-dev" /> + <property name="release.version" value="2.9.1" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 09 Nov '19

09 Nov '19

commit e20ca5e1153f3bbcb1efa5401f91ae7fcbe4cea8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 11:22:34 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index df2264f6e..400068308 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -8,8 +8,8 @@ # erinm, 2019 # Bert Massop <bert.massop(a)gmail.com>, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 -# Tonnes <tonnes.mb(a)gmail.com>, 2019 # Meteor 0id, 2019 +# Tonnes <tonnes.mb(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-06 15:48+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Meteor 0id, 2019\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>, 2019\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -227,9 +227,9 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" -"We willen dat iedereen van Tor Browser kan genieten in zijn eigen taal. Tor " -"Browser is nu beschikbaar in 32 verschillende talen en we werken er aan om " -"daar meer aan toe te voegen. Wil je ons helpen vertalen? [Kijk " +"We willen dat iedereen in de eigen taal van Tor Browser kan genieten. Tor " +"Browser is nu beschikbaar in 32 verschillende talen, en we werken eraan om " +"daar meer aan toe te voegen. Wilt u ons helpen vertalen? [Kijk " "hier](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ @@ -312,9 +312,9 @@ msgid "" " the most popular and widely used free, open source privacy technologies: " "Tor Browser and the Tor network." msgstr "" -"Het Tor Project en de bijbehorende gemeenschap ontwikkelen en verspreiden de" -" meest populaire en wijdverspreid gebruikte vrije openbron " -"privacytechnologieën: tor Browser en het Tor-netwerk." +"Het Tor Project en de bijbehorende gemeenschap ontwikkelen en verspreiden " +"enkele van de meest populaire en veelgebruikte vrije en open source " +"privacytechnologieën: Tor Browser en het Tor-netwerk." #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.body)

1 0

[collector/master] Bump version to 1.13.0-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit de8ab5f1e9ca1b0c995be6b858aad7ae3aa6f5cd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Nov 9 11:35:02 2019 +0100 Bump version to 1.13.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ac0b3c..2edc44d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.1?.? - 2019-1?-?? + + # Changes in version 1.13.0 - 2019-11-09 * Medium changes diff --git a/build.xml b/build.xml index c1c8699..9c72447 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.0" /> + <property name="release.version" value="1.13.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.9.0" />

1 0

[collector/release] Bump version to 1.12.0-dev.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 0e57dae0bfd6f3f7e0c5b5c78773818343ba9550 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 18 11:11:38 2019 +0200 Bump version to 1.12.0-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f30ea3e..bb328ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.??.? - 2019-??-?? + + # Changes in version 1.12.0 - 2019-10-18 * Medium changes diff --git a/build.xml b/build.xml index c78f5c6..8276e63 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.12.0" /> + <property name="release.version" value="1.12.0-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.8.0" />

1 0

[collector/release] Tweak BridgeDB metrics file names.
by karsten＠torproject.org 09 Nov '19

09 Nov '19

commit 31034e8781c76df218426db030cac964566e3d34 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 1 17:40:11 2019 +0100 Tweak BridgeDB metrics file names. We were using the same path for BridgeDB metrics in out/ and recent/, and file names didn't contain the "-bridgedb-metrics" suffix that we intended to add. We're now using paths generated by BridgedbMetricsPersistence. Also update create-tarballs.sh to create BridgeDB metrics tarballs. Still part of #19332. --- .../collector/bridgedb/BridgedbMetricsProcessor.java | 20 +++++++------------- src/main/resources/create-tarballs.sh | 7 +++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java index 7ae4502..9bb4f36 100644 --- a/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java +++ b/src/main/java/org/torproject/metrics/collector/bridgedb/BridgedbMetricsProcessor.java @@ -11,6 +11,7 @@ import org.torproject.metrics.collector.conf.Configuration; import org.torproject.metrics.collector.conf.ConfigurationException; import org.torproject.metrics.collector.conf.Key; import org.torproject.metrics.collector.cron.CollecTorMain; +import org.torproject.metrics.collector.persist.BridgedbMetricsPersistence; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.time.Instant; -import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Stack; @@ -50,12 +50,6 @@ public class BridgedbMetricsProcessor extends CollecTorMain { private String recentPathName; /** - * File name format. - */ - private DateTimeFormatter filenameFormat = DateTimeFormatter.ofPattern( - "uuuu/MM/dd/uuuu-MM-dd-HH-mm-ss"); - - /** * Initialize this class with the given configuration. */ public BridgedbMetricsProcessor(Configuration config) { @@ -101,10 +95,12 @@ public class BridgedbMetricsProcessor extends CollecTorMain { .readDescriptors(this.inputDirectory)) { if (descriptor instanceof BridgedbMetrics) { BridgedbMetrics bridgedbMetrics = (BridgedbMetrics) descriptor; + BridgedbMetricsPersistence persistence + = new BridgedbMetricsPersistence(bridgedbMetrics); Path tarballPath = Paths.get(this.outputPathName, - bridgedbMetrics.bridgedbMetricsEnd().format(this.filenameFormat)); + persistence.getStoragePath()); Path rsyncPath = Paths.get(this.recentPathName, - bridgedbMetrics.bridgedbMetricsEnd().format(this.filenameFormat)); + persistence.getRecentPath()); this.writeDescriptor(bridgedbMetrics.getRawDescriptorBytes(), tarballPath, rsyncPath); } else if (descriptor instanceof UnparseableDescriptor) { @@ -127,10 +123,8 @@ public class BridgedbMetricsProcessor extends CollecTorMain { * storing them in instance attributes. */ private void initializeConfiguration() throws ConfigurationException { - this.outputPathName = Paths.get(config.getPath(Key.OutputPath).toString(), - "bridgedb-metrics").toString(); - this.recentPathName = Paths.get(config.getPath(Key.RecentPath).toString(), - "bridgedb-metrics").toString(); + this.outputPathName = config.getPath(Key.OutputPath).toString(); + this.recentPathName = config.getPath(Key.RecentPath).toString(); this.inputDirectory = config.getPath(Key.BridgedbMetricsLocalOrigins).toFile(); } diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh index 695bb24..3927960 100755 --- a/src/main/resources/create-tarballs.sh +++ b/src/main/resources/create-tarballs.sh @@ -63,6 +63,8 @@ TARBALLS=( snowflakes-$YEARTWO-$MONTHTWO bridge-pool-assignments-$YEARONE-$MONTHONE bridge-pool-assignments-$YEARTWO-$MONTHTWO + bridgedb-metrics-$YEARONE-$MONTHONE + bridgedb-metrics-$YEARTWO-$MONTHTWO ) TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq)) @@ -94,6 +96,8 @@ DIRECTORIES=( $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/ $OUTDIR/bridge-pool-assignments/$YEARONE/$MONTHONE/ $OUTDIR/bridge-pool-assignments/$YEARTWO/$MONTHTWO/ + $OUTDIR/bridgedb-metrics/$YEARONE/$MONTHONE/ + $OUTDIR/bridgedb-metrics/$YEARTWO/$MONTHTWO/ ) DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq)) @@ -183,4 +187,7 @@ ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz mkdir -p $ARCHIVEDIR/bridge-pool-assignments/ ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ $TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz +mkdir -p $ARCHIVEDIR/bridgedb-metrics/ +ln -f -s -t $ARCHIVEDIR/bridgedb-metrics/ $TARBALLTARGETDIR/bridgedb-metrics-20??-??.tar.xz + echo `date` "Finished."

1 0