Issue #21 - Remove remaining telemetry structs, callers and flags.

3 files changed, 2 insertions, 32 deletions

diff --git a/mailnews/db/gloda/modules/datastore.js b/mailnews/db/gloda/modules/datastore.js
index 70bbdc6a75..c9374c5637 100644
--- a/mailnews/db/gloda/modules/datastore.js
+++ b/mailnews/db/gloda/modules/datastore.js
@@ -1030,17 +1030,6 @@ var GlodaDatastore = {
 
     var dbConnection;
 
-    // Report about the size of the database through telemetry (if there's a
-    // database, naturally).
-    if (dbFile.exists()) {
-      try {
-        let h = Services.telemetry.getHistogramById("THUNDERBIRD_GLODA_SIZE_MB");
-        h.add(dbFile.fileSize/1048576);
-      } catch (e) {
-        this._log.warn("Couldn't report telemetry", e);
-      }
-    }
-
     // Create the file if it does not exist
     if (!dbFile.exists()) {
       this._log.debug("Creating database because it doesn't exist.");
diff --git a/mailnews/db/gloda/modules/indexer.js b/mailnews/db/gloda/modules/indexer.js
index f6c9395306..e75b6796b9 100644
--- a/mailnews/db/gloda/modules/indexer.js
+++ b/mailnews/db/gloda/modules/indexer.js
@@ -1006,10 +1006,6 @@ var GlodaIndexer = {
       //     make ourselves less responsive by drawing out the period of time we
       //     are dominating the main thread.
       this._perfIndexStopwatch.start();
-      // For telemetry purposes, we want to know how many messages we've been
-      //  processing during that batch, and how long it took, pauses included.
-      let t0 = Date.now();
-      this._indexedMessageCount = 0;
       batchCount = 0;
       while (batchCount < this._indexTokens) {
         if ((this._callbackHandle.activeIterator === null) &&
@@ -1150,21 +1146,6 @@ var GlodaIndexer = {
         }
       }
 
-      // All pauses have been taken, how effective were we? Report!
-      // XXX: there's possibly a lot of fluctuation since we go through here
-      // every 5 messages or even less
-      if (this._indexedMessageCount > 0) {
-        let delta = (Date.now() - t0)/1000; // in seconds
-        let v = Math.round(this._indexedMessageCount/delta);
-        try {
-          let h = Services.telemetry
-            .getHistogramById("THUNDERBIRD_INDEXING_RATE_MSG_PER_S");
-          h.add(v);
-        } catch (e) {
-          this._log.warn("Couldn't report telemetry", e, v);
-        }
-      }
-
       if (batchCount > 0) {
         let totalTime = this._perfIndexStopwatch.realTimeSeconds * 1000;
         let timePerToken = totalTime / batchCount;
diff --git a/mailnews/local/src/nsPop3Sink.cpp b/mailnews/local/src/nsPop3Sink.cpp
index af68ea2bef..1229744cab 100644
--- a/mailnews/local/src/nsPop3Sink.cpp
+++ b/mailnews/local/src/nsPop3Sink.cpp
@@ -724,13 +724,13 @@ nsresult nsPop3Sink::WriteLineToMailbox(const nsACString& buffer)
         nsString folderName;
         if (localFolder)
           localFolder->GetPrettiestName(folderName);
-        // This merits a console message, it's poor man's telemetry.
+        // This merits a console message.
         MsgLogToConsole4(
           NS_LITERAL_STRING("Unexpected file position change detected") +
           (folderName.IsEmpty() ? EmptyString() : NS_LITERAL_STRING(" in folder ")) +
           (folderName.IsEmpty() ? EmptyString() : folderName) + NS_LITERAL_STRING(". "
           "If you can reliably reproduce this, please report the steps "
-          "you used to dev-apps-thunderbird@lists.mozilla.org or to bug 1308335 at bugzilla.mozilla.org. "
+          "you used to the application maintainer. "
           "Resolving this problem will allow speeding up message downloads."),
           NS_LITERAL_STRING(__FILE__), __LINE__, nsIScriptError::errorFlag);
 #ifdef DEBUG