NetDb Stats: Cleanup of commented out stats

router/java/src/net/i2p/router/StatisticsManager.java

@@ -129,7 +129,6 @@ public class StatisticsManager implements Service {
             if (false)
                 stats.putAll(_context.profileManager().summarizePeers(_publishedStats));
 
-            boolean commentMeOutInDot33 = RouterVersion.VERSION.equals("0.6.1.32");
             includeThroughput(stats);
             //includeRate("router.invalidMessageTime", stats, new long[] { 10*60*1000 });
             //includeRate("router.duplicateMessageId", stats, new long[] { 24*60*60*1000 });
@@ -137,8 +136,7 @@ public class StatisticsManager implements Service {
             //includeRate("tunnel.fragmentedDropped", stats, new long[] { 10*60*1000, 3*60*60*1000 });
             //includeRate("tunnel.fullFragments", stats, new long[] { 10*60*1000, 3*60*60*1000 });
             //includeRate("tunnel.smallFragments", stats, new long[] { 10*60*1000, 3*60*60*1000 });
-           if (commentMeOutInDot33)
-            includeRate("tunnel.testFailedTime", stats, new long[] { 10*60*1000 });
+            //includeRate("tunnel.testFailedTime", stats, new long[] { 10*60*1000 });
             
             includeRate("tunnel.buildFailure", stats, new long[] { 60*60*1000 });
             includeRate("tunnel.buildSuccess", stats, new long[] { 60*60*1000 });
@@ -151,8 +149,7 @@ public class StatisticsManager implements Service {
             //includeRate("router.throttleTunnelProbTooFast", stats, new long[] { 60*60*1000 });
             //includeRate("router.throttleTunnelProcessingTime1m", stats, new long[] { 60*60*1000 });
 
-           if (commentMeOutInDot33)
-            includeRate("router.fastPeers", stats, new long[] { 60*60*1000 });
+            //includeRate("router.fastPeers", stats, new long[] { 60*60*1000 });
             
             //includeRate("udp.statusOK", stats, new long[] { 20*60*1000 });
             //includeRate("udp.statusDifferent", stats, new long[] { 20*60*1000 });
@@ -166,11 +163,7 @@ public class StatisticsManager implements Service {
             
             //includeRate("transport.sendProcessingTime", stats, new long[] { 60*60*1000 });
             //includeRate("jobQueue.jobRunSlow", stats, new long[] { 10*60*1000l, 60*60*1000l });
-           if (commentMeOutInDot33) {   // get rid of 60s stats
-            includeRate("crypto.elGamal.encrypt", stats, new long[] { 60*1000, 60*60*1000 });
-           } else {
             includeRate("crypto.elGamal.encrypt", stats, new long[] { 60*60*1000 });
-           }
             includeRate("tunnel.participatingTunnels", stats, new long[] { 5*60*1000, 60*60*1000 });
             //includeRate("tunnel.testSuccessTime", stats, new long[] { 10*60*1000l });
             includeRate("client.sendAckTime", stats, new long[] { 60*60*1000 }, true);
@@ -185,27 +178,15 @@ public class StatisticsManager implements Service {
             // Round 2nd hour to 90m since peers use 2h minimum to route
             long publishedUptime = _context.router().getUptime();
             if (publishedUptime < 60*60*1000) publishedUptime = 60*60*1000;
-            else if (publishedUptime < 2*60*60*1000 && !commentMeOutInDot33) publishedUptime = 90*60*1000;
+            else if (publishedUptime < 2*60*60*1000) publishedUptime = 90*60*1000;
 
             stats.setProperty("stat_uptime", DataHelper.formatDuration(publishedUptime));
             //stats.setProperty("stat__rateKey", "avg;maxAvg;pctLifetime;[sat;satLim;maxSat;maxSatLim;][num;lifetimeFreq;maxFreq]");
             
-           if (commentMeOutInDot33) {   // get rid of 60s stats
-            includeRate("tunnel.buildRequestTime", stats, new long[] { 60*1000, 10*60*1000 });
             //includeRate("tunnel.decryptRequestTime", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildClientExpire", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildClientReject", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildClientSuccess", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildExploratoryExpire", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildExploratoryReject", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.buildExploratorySuccess", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.rejectTimeout", stats, new long[] { 60*1000, 10*60*1000 });
             //includeRate("udp.packetDequeueTime", stats, new long[] { 60*1000 });
             //includeRate("udp.packetVerifyTime", stats, new long[] { 60*1000 });
             
-            includeRate("tunnel.rejectOverloaded", stats, new long[] { 60*1000, 10*60*1000 });
-            includeRate("tunnel.acceptLoad", stats, new long[] { 60*1000, 10*60*1000 });
-           } else {
             includeRate("tunnel.buildRequestTime", stats, new long[] { 10*60*1000 });
             includeRate("tunnel.buildClientExpire", stats, new long[] { 10*60*1000 });
             includeRate("tunnel.buildClientReject", stats, new long[] { 10*60*1000 });
@@ -216,7 +197,6 @@ public class StatisticsManager implements Service {
             includeRate("tunnel.rejectTimeout", stats, new long[] { 10*60*1000 });
             includeRate("tunnel.rejectOverloaded", stats, new long[] { 10*60*1000 });
             includeRate("tunnel.acceptLoad", stats, new long[] { 10*60*1000 });
-           }
             
             if (FloodfillNetworkDatabaseFacade.isFloodfill(_context.router().getRouterInfo())) {
                 stats.setProperty("netdb.knownRouters", ""+_context.netDb().getKnownRouters());