[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [metrics-web/master] Turn beta onionperf.csv into stable torperf-1.1.csv.



commit 5627636a8ed25358087c62500a0a8abe153c43fe
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Fri May 12 22:28:06 2017 +0200

    Turn beta onionperf.csv into stable torperf-1.1.csv.
---
 .../main/java/org/torproject/metrics/onionperf/Main.java |  2 +-
 website/rserve/graphs.R                                  |  4 ++--
 .../metrics/web/research/ResearchStatsServlet.java       |  1 +
 website/src/main/resources/etc/metrics.json              |  4 ++--
 website/src/main/resources/web/WEB-INF/graph.jsp         |  2 +-
 website/src/main/resources/web/WEB-INF/stats.jsp         | 16 ++++++++--------
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java b/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java
index f54fa9b..2af3100 100644
--- a/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java
+++ b/modules/onionperf/src/main/java/org/torproject/metrics/onionperf/Main.java
@@ -46,7 +46,7 @@ public class Main {
     Connection connection = connectToDatabase(dbUrlString);
     importOnionPerfFiles(connection);
     SortedSet<String> statistics = queryOnionPerf(connection);
-    writeStatistics(Paths.get("stats", "onionperf.csv"), statistics);
+    writeStatistics(Paths.get("stats", "torperf-1.1.csv"), statistics);
     disconnectFromDatabase(connection);
     log.info("Terminated onionperf module.");
   }
diff --git a/website/rserve/graphs.R b/website/rserve/graphs.R
index fc84aa8..aafb505 100644
--- a/website/rserve/graphs.R
+++ b/website/rserve/graphs.R
@@ -564,7 +564,7 @@ plot_torperf <- function(start, end, source, server, filesize, path) {
   filesizeVal <- ifelse(filesize == '50kb', 50 * 1024,
           ifelse(filesize == '1mb', 1024 * 1024, 5 * 1024 * 1024))
   t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",
-                "onionperf.csv", sep = ""), stringsAsFactors = FALSE)
+                "torperf-1.1.csv", sep = ""), stringsAsFactors = FALSE)
   known_sources <- c("all", unique(t[t$source != "", "source"]))
   colours <- data.frame(source = known_sources,
       colour = brewer.pal(length(known_sources), "Paired"),
@@ -616,7 +616,7 @@ plot_torperf_failures <- function(start, end, source, server, filesize, path) {
   filesizeVal <- ifelse(filesize == '50kb', 50 * 1024,
           ifelse(filesize == '1mb', 1024 * 1024, 5 * 1024 * 1024))
   t <- read.csv(paste("/srv/metrics.torproject.org/metrics/shared/stats/",
-                "onionperf.csv", sep = ""), stringsAsFactors = FALSE)
+                "torperf-1.1.csv", sep = ""), stringsAsFactors = FALSE)
   t <- t[t$date >= start & t$date <= end & t$filesize == filesizeVal &
          t$source == ifelse(source == 'all', '', source) &
          t$server == server, ]
diff --git a/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java b/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
index eaea36c..0a37c04 100644
--- a/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
+++ b/website/src/main/java/org/torproject/metrics/web/research/ResearchStatsServlet.java
@@ -35,6 +35,7 @@ public class ResearchStatsServlet extends HttpServlet {
     this.availableStatisticsFiles.add("clients");
     this.availableStatisticsFiles.add("userstats-combined");
     this.availableStatisticsFiles.add("torperf");
+    this.availableStatisticsFiles.add("torperf-1.1");
     this.availableStatisticsFiles.add("connbidirect2");
     this.availableStatisticsFiles.add("advbwdist");
     this.availableStatisticsFiles.add("hidserv");
diff --git a/website/src/main/resources/etc/metrics.json b/website/src/main/resources/etc/metrics.json
index 6c3dde1..ea4e55a 100644
--- a/website/src/main/resources/etc/metrics.json
+++ b/website/src/main/resources/etc/metrics.json
@@ -311,7 +311,7 @@
       "filesize"
     ],
     "data": [
-      "onionperf"
+      "torperf-1.1"
     ]
   },
   {
@@ -328,7 +328,7 @@
       "filesize"
     ],
     "data": [
-      "onionperf"
+      "torperf-1.1"
     ]
   },
   {
diff --git a/website/src/main/resources/web/WEB-INF/graph.jsp b/website/src/main/resources/web/WEB-INF/graph.jsp
index 20372e8..d476dad 100644
--- a/website/src/main/resources/web/WEB-INF/graph.jsp
+++ b/website/src/main/resources/web/WEB-INF/graph.jsp
@@ -132,7 +132,7 @@
       </p>
     </c:if>
     <c:if test="${fn:length(server) > 0}">
-      <p><b>Server (beta):</b>
+      <p><b>Server:</b>
       <c:forEach var="row" items="${server}">
         <label class="radio-label">
           <input type="radio" name="server" value="${row[0]}"${row[1]}> ${row[0]}
diff --git a/website/src/main/resources/web/WEB-INF/stats.jsp b/website/src/main/resources/web/WEB-INF/stats.jsp
index d0e0c2d..8926b16 100644
--- a/website/src/main/resources/web/WEB-INF/stats.jsp
+++ b/website/src/main/resources/web/WEB-INF/stats.jsp
@@ -306,7 +306,12 @@ there are users by either of the two numbers.</li>
 </div>
 
 <div class="container">
-<h2>Performance of downloading static files over Tor <a href="#torperf" name="torperf" class="anchor">#</a></h2>
+<h2>Performance of downloading static files over Tor (deprecated) <a href="#torperf" name="torperf" class="anchor">#</a></h2>
+
+<div class="bs-callout bs-callout-warning">
+<h3>Deprecated</h3>
+<p>As of May 12, 2017, the linked data file has been replaced by <a href="#torperf-1.1">this data file</a>.  Starting on June 1, 2017, the linked data file will not be updated anymore.  This section and the linked data file will be removed in the future.</p>
+</div>
 
 <p>The following data file contains aggregate statistics on performance when
 downloading static files of different sizes over Tor.  These statistics are
@@ -355,12 +360,7 @@ over Tor.</li>
 </div>
 
 <div class="container">
-<h2>Performance of downloading static files over Tor <a href="#onionperf" name="onionperf" class="anchor">#</a></h2>
-
-<div class="bs-callout bs-callout-warning">
-<h3>Beta</h3>
-<p>As of May 1, 2017, this data file is still under development.  If it becomes stable, it will replace <a href="#torperf">this data file</a>.  But until that is the case, it may change or disappear without prior notice.</p>
-</div>
+<h2>Performance of downloading static files over Tor <a href="#torperf-1.1" name="torperf-1.1" class="anchor">#</a></h2>
 
 <p>The following data file contains aggregate statistics on performance when
 downloading static files of different sizes over Tor.  These statistics are
@@ -372,7 +372,7 @@ as well as total numbers of requests, timeouts, and failures.  Raw Onionperf and
 Torperf measurement data is available on the <a
 href="https://collector.torproject.org/#torperf";>CollecTor</a> website.</p>
 
-<p><b>Download as <a href="stats/onionperf.csv">CSV file</a>.</b></p>
+<p><b>Download as <a href="stats/torperf-1.1.csv">CSV file</a>.</b></p>
 
 <p>The statistics file contains the following columns:</p>
 <ul>

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits