Issue #21 - Remove Telemetry from Accessibility, EME and WebRTC.

dom/media/eme/DetailedPromise.cpp

@@ -19,23 +19,8 @@ DetailedPromise::DetailedPromise(nsIGlobalObject* aGlobal,
 {
 }
 
-DetailedPromise::DetailedPromise(nsIGlobalObject* aGlobal,
-                                 const nsACString& aName,
-                                 Telemetry::ID aSuccessLatencyProbe,
-                                 Telemetry::ID aFailureLatencyProbe)
-  : DetailedPromise(aGlobal, aName)
-{
-  mSuccessLatencyProbe.Construct(aSuccessLatencyProbe);
-  mFailureLatencyProbe.Construct(aFailureLatencyProbe);
-}
-
 DetailedPromise::~DetailedPromise()
 {
-  // It would be nice to assert that mResponded is identical to
-  // GetPromiseState() == PromiseState::Rejected.  But by now we've been
-  // unlinked, so don't have a reference to our actual JS Promise object
-  // anymore.
-  MaybeReportTelemetry(Failed);
 }
 
 void
@@ -45,8 +30,6 @@ DetailedPromise::MaybeReject(nsresult aArg, const nsACString& aReason)
                       PromiseFlatCString(aReason).get());
   EME_LOG(msg.get());
 
-  MaybeReportTelemetry(Failed);
-
   LogToBrowserConsole(NS_ConvertUTF8toUTF16(msg));
 
   ErrorResult rv;
@@ -70,32 +53,5 @@ DetailedPromise::Create(nsIGlobalObject* aGlobal,
   return aRv.Failed() ? nullptr : promise.forget();
 }
 
-/* static */ already_AddRefed<DetailedPromise>
-DetailedPromise::Create(nsIGlobalObject* aGlobal,
-                        ErrorResult& aRv,
-                        const nsACString& aName,
-                        Telemetry::ID aSuccessLatencyProbe,
-                        Telemetry::ID aFailureLatencyProbe)
-{
-  RefPtr<DetailedPromise> promise = new DetailedPromise(aGlobal, aName, aSuccessLatencyProbe, aFailureLatencyProbe);
-  promise->CreateWrapper(nullptr, aRv);
-  return aRv.Failed() ? nullptr : promise.forget();
-}
-
-void
-DetailedPromise::MaybeReportTelemetry(Status aStatus)
-{
-  if (mResponded) {
-    return;
-  }
-  mResponded = true;
-  if (!mSuccessLatencyProbe.WasPassed() || !mFailureLatencyProbe.WasPassed()) {
-    return;
-  }
-  uint32_t latency = (TimeStamp::Now() - mStartTime).ToMilliseconds();
-  EME_LOG("%s %s latency %ums reported via telemetry", mName.get(),
-          ((aStatus == Succeeded) ? "succcess" : "failure"), latency);
-}
-
 } // namespace dom
 } // namespace mozilla

dom/media/eme/DetailedPromise.h

@@ -7,7 +7,6 @@
 #define __DetailedPromise_h__
 
 #include "mozilla/dom/Promise.h"
-#include "mozilla/Telemetry.h"
 #include "EMEUtils.h"
 
 namespace mozilla {
@@ -26,17 +25,10 @@ public:
          ErrorResult& aRv,
          const nsACString& aName);
 
-  static already_AddRefed<DetailedPromise>
-  Create(nsIGlobalObject* aGlobal, ErrorResult& aRv,
-         const nsACString& aName,
-         Telemetry::ID aSuccessLatencyProbe,
-         Telemetry::ID aFailureLatencyProbe);
-
   template <typename T>
   void MaybeResolve(const T& aArg)
   {
     EME_LOG("%s promise resolved", mName.get());
-    MaybeReportTelemetry(Succeeded);
     Promise::MaybeResolve<T>(aArg);
   }
 
@@ -50,20 +42,13 @@ private:
   explicit DetailedPromise(nsIGlobalObject* aGlobal,
                            const nsACString& aName);
 
-  explicit DetailedPromise(nsIGlobalObject* aGlobal,
-                           const nsACString& aName,
-                           Telemetry::ID aSuccessLatencyProbe,
-                           Telemetry::ID aFailureLatencyProbe);
   virtual ~DetailedPromise();
 
   enum Status { Succeeded, Failed };
-  void MaybeReportTelemetry(Status aStatus);
 
   nsCString mName;
   bool mResponded;
   TimeStamp mStartTime;
-  Optional<Telemetry::ID> mSuccessLatencyProbe;
-  Optional<Telemetry::ID> mFailureLatencyProbe;
 };
 
 } // namespace dom

dom/media/eme/EMEUtils.cpp

@@ -92,17 +92,4 @@ KeySystemToGMPName(const nsAString& aKeySystem)
   return EmptyString();
 }
 
-CDMType
-ToCDMTypeTelemetryEnum(const nsString& aKeySystem)
-{
-  if (IsWidevineKeySystem(aKeySystem)) {
-    return CDMType::eWidevine;
-  } else if (IsClearkeyKeySystem(aKeySystem)) {
-    return CDMType::eClearKey;
-  } else if (IsPrimetimeKeySystem(aKeySystem)) {
-    return CDMType::ePrimetime;
-  }
-  return CDMType::eUnknown;
-}
-
 } // namespace mozilla

dom/media/eme/EMEUtils.h

@@ -103,9 +103,6 @@ enum CDMType {
   eUnknown = 3
 };
 
-CDMType
-ToCDMTypeTelemetryEnum(const nsString& aKeySystem);
-
 } // namespace mozilla
 
 #endif // EME_LOG_H_