diff --git a/dom/media/AudioStream.cpp b/dom/media/AudioStream.cpp index 730a59312b9d..cb161c2b9f43 100644 --- a/dom/media/AudioStream.cpp +++ b/dom/media/AudioStream.cpp @@ -16,7 +16,6 @@ #include "mozilla/Sprintf.h" #include "mozilla/Unused.h" #include -#include "mozilla/Telemetry.h" #include "CubebUtils.h" #include "nsNativeCharsetUtils.h" #include "nsPrintfCString.h" diff --git a/dom/media/Benchmark.cpp b/dom/media/Benchmark.cpp index c70c53d50541..f2818a82813a 100644 --- a/dom/media/Benchmark.cpp +++ b/dom/media/Benchmark.cpp @@ -19,7 +19,6 @@ #include "mozilla/StaticMutex.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/TaskQueue.h" -#include "mozilla/Telemetry.h" #include "mozilla/dom/ContentChild.h" #include "mozilla/gfx/gfxVars.h" #include "nsGkAtoms.h" diff --git a/dom/media/MediaCache.cpp b/dom/media/MediaCache.cpp index 41d51a49cc0f..d4d5419c384d 100644 --- a/dom/media/MediaCache.cpp +++ b/dom/media/MediaCache.cpp @@ -21,7 +21,6 @@ #include "mozilla/StaticPtr.h" #include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_media.h" -#include "mozilla/Telemetry.h" #include "nsContentUtils.h" #include "nsINetworkLinkService.h" #include "nsIObserverService.h" diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp index 38808bafbddb..14219454520d 100644 --- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -37,7 +37,6 @@ #include "mozilla/Sprintf.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/TaskQueue.h" -#include "mozilla/Telemetry.h" #include "nsIMemoryReporter.h" #include "nsPrintfCString.h" #include "nsTArray.h" diff --git a/dom/media/VideoFrameContainer.cpp b/dom/media/VideoFrameContainer.cpp index f7471cdcca2f..f34a74afb3f9 100644 --- a/dom/media/VideoFrameContainer.cpp +++ b/dom/media/VideoFrameContainer.cpp @@ -10,7 +10,6 @@ # include "GLImages.h" // for SurfaceTextureImage #endif #include "MediaDecoderOwner.h" -#include "mozilla/Telemetry.h" #include "mozilla/AbstractThread.h" using namespace mozilla::layers; @@ -18,27 +17,6 @@ using namespace mozilla::layers; namespace mozilla { #define NS_DispatchToMainThread(...) CompileError_UseAbstractMainThreadInstead -namespace { -template -class AutoTimer { - // Set a threshold to reduce performance overhead - // for we're measuring hot spots. - static const uint32_t sThresholdMS = 1000; - - public: - ~AutoTimer() { - auto end = TimeStamp::Now(); - auto diff = uint32_t((end - mStart).ToMilliseconds()); - if (diff > sThresholdMS) { - Telemetry::Accumulate(ID, diff); - } - } - - private: - const TimeStamp mStart = TimeStamp::Now(); -}; -} // namespace - VideoFrameContainer::VideoFrameContainer( MediaDecoderOwner* aOwner, already_AddRefed aContainer) : mOwner(aOwner), diff --git a/dom/media/eme/DetailedPromise.cpp b/dom/media/eme/DetailedPromise.cpp index 0692a1dd07e6..47aca1083c2e 100644 --- a/dom/media/eme/DetailedPromise.cpp +++ b/dom/media/eme/DetailedPromise.cpp @@ -14,26 +14,13 @@ namespace mozilla::dom { DetailedPromise::DetailedPromise(nsIGlobalObject* aGlobal, const nsACString& aName) - : Promise(aGlobal), - mName(aName), - mResponded(false), - mStartTime(TimeStamp::Now()) {} - -DetailedPromise::DetailedPromise(nsIGlobalObject* aGlobal, - const nsACString& aName, - Telemetry::HistogramID aSuccessLatencyProbe, - Telemetry::HistogramID aFailureLatencyProbe) - : DetailedPromise(aGlobal, aName) { - mSuccessLatencyProbe.Construct(aSuccessLatencyProbe); - mFailureLatencyProbe.Construct(aFailureLatencyProbe); -} + : Promise(aGlobal), mName(aName), mStartTime(TimeStamp::Now()) {} 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(kFailed); } void DetailedPromise::LogRejectionReason(uint32_t aErrorCode, @@ -42,8 +29,6 @@ void DetailedPromise::LogRejectionReason(uint32_t aErrorCode, aErrorCode, PromiseFlatCString(aReason).get()); EME_LOG("%s", msg.get()); - MaybeReportTelemetry(kFailed); - LogToBrowserConsole(NS_ConvertUTF8toUTF16(msg)); } @@ -67,21 +52,4 @@ already_AddRefed DetailedPromise::Create( return aRv.Failed() ? nullptr : promise.forget(); } -void DetailedPromise::MaybeReportTelemetry(eStatus 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 == kSucceeded) ? "succcess" : "failure"), latency); - Telemetry::HistogramID tid = (aStatus == kSucceeded) - ? mSuccessLatencyProbe.Value() - : mFailureLatencyProbe.Value(); - Telemetry::Accumulate(tid, latency); -} - } // namespace mozilla::dom diff --git a/dom/media/eme/DetailedPromise.h b/dom/media/eme/DetailedPromise.h index 02c774755f52..7696bfebc073 100644 --- a/dom/media/eme/DetailedPromise.h +++ b/dom/media/eme/DetailedPromise.h @@ -8,7 +8,6 @@ #define __DetailedPromise_h__ #include "mozilla/dom/Promise.h" -#include "mozilla/Telemetry.h" #include "EMEUtils.h" namespace mozilla::dom { @@ -27,7 +26,6 @@ class DetailedPromise : public Promise { template void MaybeResolve(T&& aArg) { EME_LOG("%s promise resolved", mName.get()); - MaybeReportTelemetry(eStatus::kSucceeded); Promise::MaybeResolve(std::forward(aArg)); } @@ -83,20 +81,13 @@ class DetailedPromise : public Promise { private: explicit DetailedPromise(nsIGlobalObject* aGlobal, const nsACString& aName); - explicit DetailedPromise(nsIGlobalObject* aGlobal, const nsACString& aName, - Telemetry::HistogramID aSuccessLatencyProbe, - Telemetry::HistogramID aFailureLatencyProbe); virtual ~DetailedPromise(); enum eStatus { kSucceeded, kFailed }; - void MaybeReportTelemetry(eStatus aStatus); void LogRejectionReason(uint32_t aErrorCode, const nsACString& aReason); nsCString mName; - bool mResponded; TimeStamp mStartTime; - Optional mSuccessLatencyProbe; - Optional mFailureLatencyProbe; }; } // namespace mozilla::dom diff --git a/dom/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp index 724576567e38..7fc69bc5d70a 100644 --- a/dom/media/eme/MediaKeys.cpp +++ b/dom/media/eme/MediaKeys.cpp @@ -10,7 +10,6 @@ #include "GMPCrashHelper.h" #include "mozilla/EMEUtils.h" #include "mozilla/JSONStringWriteFuncs.h" -#include "mozilla/Telemetry.h" #include "mozilla/dom/DOMException.h" #include "mozilla/dom/Document.h" #include "mozilla/dom/HTMLMediaElement.h" diff --git a/dom/media/encoder/TrackEncoder.cpp b/dom/media/encoder/TrackEncoder.cpp index 8e03fd6fe3cf..a64dafd125d4 100644 --- a/dom/media/encoder/TrackEncoder.cpp +++ b/dom/media/encoder/TrackEncoder.cpp @@ -14,7 +14,6 @@ #include "mozilla/ProfilerLabels.h" #include "mozilla/RollingMean.h" #include "VideoUtils.h" -#include "mozilla/Telemetry.h" namespace mozilla { diff --git a/dom/media/gmp/GMPServiceParent.cpp b/dom/media/gmp/GMPServiceParent.cpp index 9bc353b04ac2..582daffe594c 100644 --- a/dom/media/gmp/GMPServiceParent.cpp +++ b/dom/media/gmp/GMPServiceParent.cpp @@ -30,7 +30,6 @@ #include "mozilla/SpinEventLoopUntil.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/SyncRunnable.h" -#include "mozilla/Telemetry.h" #include "mozilla/Unused.h" #if defined(XP_WIN) # include "mozilla/UntrustedModulesData.h" diff --git a/dom/media/ipc/RemoteVideoDecoder.cpp b/dom/media/ipc/RemoteVideoDecoder.cpp index c73c8afc940d..1d2c1513bc4b 100644 --- a/dom/media/ipc/RemoteVideoDecoder.cpp +++ b/dom/media/ipc/RemoteVideoDecoder.cpp @@ -22,7 +22,6 @@ #include "RemoteDecoderManagerParent.h" #include "RemoteImageHolder.h" #include "mozilla/StaticPrefs_media.h" -#include "mozilla/Telemetry.h" #include "mozilla/layers/ImageClient.h" #include "mozilla/layers/TextureClient.h" #include "mozilla/layers/VideoBridgeChild.h" diff --git a/dom/media/mediacontrol/ContentMediaController.cpp b/dom/media/mediacontrol/ContentMediaController.cpp index 1818e5cfa310..807e9c4a357f 100644 --- a/dom/media/mediacontrol/ContentMediaController.cpp +++ b/dom/media/mediacontrol/ContentMediaController.cpp @@ -7,7 +7,6 @@ #include "MediaControlUtils.h" #include "mozilla/ClearOnShutdown.h" #include "mozilla/StaticPtr.h" -#include "mozilla/Telemetry.h" #include "mozilla/ToString.h" #include "mozilla/dom/BrowsingContext.h" #include "mozilla/dom/CanonicalBrowsingContext.h" diff --git a/dom/media/mediacontrol/ContentPlaybackController.cpp b/dom/media/mediacontrol/ContentPlaybackController.cpp index 0bd0082a67f7..894ad6c992a3 100644 --- a/dom/media/mediacontrol/ContentPlaybackController.cpp +++ b/dom/media/mediacontrol/ContentPlaybackController.cpp @@ -9,7 +9,6 @@ #include "mozilla/dom/MediaSession.h" #include "mozilla/dom/Navigator.h" #include "mozilla/dom/WindowContext.h" -#include "mozilla/Telemetry.h" #include "nsFocusManager.h" // avoid redefined macro in unified build diff --git a/dom/media/mediacontrol/MediaControlService.cpp b/dom/media/mediacontrol/MediaControlService.cpp index fd42715b41a7..e7dca87fbaab 100644 --- a/dom/media/mediacontrol/MediaControlService.cpp +++ b/dom/media/mediacontrol/MediaControlService.cpp @@ -12,7 +12,6 @@ #include "mozilla/Services.h" #include "mozilla/StaticPrefs_media.h" #include "mozilla/StaticPtr.h" -#include "mozilla/Telemetry.h" #include "nsIObserverService.h" #include "nsXULAppAPI.h" diff --git a/dom/media/mp4/MP4Demuxer.cpp b/dom/media/mp4/MP4Demuxer.cpp index c6f3b104d19c..b397e571603a 100644 --- a/dom/media/mp4/MP4Demuxer.cpp +++ b/dom/media/mp4/MP4Demuxer.cpp @@ -22,7 +22,6 @@ #include "VPXDecoder.h" #include "mozilla/Span.h" #include "mozilla/StaticPrefs_media.h" -#include "mozilla/Telemetry.h" #include "nsPrintfCString.h" #include "SampleIterator.h" diff --git a/dom/media/mp4/MP4Metadata.cpp b/dom/media/mp4/MP4Metadata.cpp index 8eb272a46342..5f1749fdc4ce 100644 --- a/dom/media/mp4/MP4Metadata.cpp +++ b/dom/media/mp4/MP4Metadata.cpp @@ -7,7 +7,6 @@ #include "mozilla/EndianUtils.h" #include "mozilla/Logging.h" #include "mozilla/RefPtr.h" -#include "mozilla/Telemetry.h" #include "mozilla/UniquePtr.h" #include "VideoUtils.h" #include "MoofParser.h" diff --git a/dom/media/ogg/OggDemuxer.cpp b/dom/media/ogg/OggDemuxer.cpp index effaf197c33a..ff7b196a5ae1 100644 --- a/dom/media/ogg/OggDemuxer.cpp +++ b/dom/media/ogg/OggDemuxer.cpp @@ -16,7 +16,6 @@ #include "mozilla/ScopeExit.h" #include "mozilla/SchedulerGroup.h" #include "mozilla/SharedThreadPool.h" -#include "mozilla/Telemetry.h" #include "mozilla/TimeStamp.h" #include "nsDebug.h" #include "nsAutoRef.h" diff --git a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp index 69d8b423039d..18cf8c591f67 100644 --- a/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp +++ b/dom/media/platforms/ffmpeg/FFmpegAudioDecoder.cpp @@ -17,7 +17,6 @@ # include "libavutil/channel_layout.h" #endif #include "mozilla/StaticPrefs_media.h" -#include "mozilla/Telemetry.h" namespace mozilla { diff --git a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp index 63db5efae805..eca9f271da54 100644 --- a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp @@ -11,7 +11,6 @@ #include "WMFUtils.h" #include "mozilla/AbstractThread.h" #include "mozilla/Logging.h" -#include "mozilla/Telemetry.h" #include "nsTArray.h" #include "BufferReader.h" #include "mozilla/ScopeExit.h" diff --git a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp index 19dab1d27c0a..0438ced7edbc 100644 --- a/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp +++ b/dom/media/platforms/wmf/WMFMediaDataDecoder.cpp @@ -12,7 +12,6 @@ #include "mozilla/ProfilerMarkers.h" #include "mozilla/SyncRunnable.h" #include "mozilla/TaskQueue.h" -#include "mozilla/Telemetry.h" #include "nsTArray.h" #define LOG(...) MOZ_LOG(sPDMLog, mozilla::LogLevel::Debug, (__VA_ARGS__)) diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp index a3ad67b93774..6e3fb54830c9 100644 --- a/dom/media/webaudio/AudioDestinationNode.cpp +++ b/dom/media/webaudio/AudioDestinationNode.cpp @@ -21,8 +21,6 @@ #include "mozilla/dom/ScriptSettings.h" #include "mozilla/dom/WakeLock.h" #include "mozilla/dom/power/PowerManagerService.h" -#include "mozilla/Telemetry.h" -#include "mozilla/TelemetryHistogramEnums.h" #include "nsContentUtils.h" #include "nsGlobalWindowInner.h" #include "Tracing.h"