Backed out changeset ef18dbaff6c7 (bug 1569250) for causing failures in AccumulateTimeDelta. CLOSED TREE

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp

@@ -104,7 +104,6 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/net/DataChannelProtocol.h"
-#include "MediaManager.h"
 
 #include "MediaStreamGraphImpl.h"
 
@@ -2448,49 +2447,6 @@ void PeerConnectionImpl::IceConnectionStateChange(
       MOZ_ASSERT_UNREACHABLE("Unexpected mIceConnectionState!");
   }
 
-  // Collect telemetry for situations where hostname obfuscation would be used
-  uint64_t winId = GetWindow()->WindowID();
-  bool iceJustFailed =
-      mIceConnectionState == dom::RTCIceConnectionState::Failed;
-  bool iceJustSucceeded =
-      mIceConnectionState == dom::RTCIceConnectionState::Connected;
-  if (!MediaManager::Get()->IsActivelyCapturingOrHasAPermission(winId)) {
-    bool enabled = Preferences::GetBool(
-        "media.peerconnection.ice.obfuscate_host_addresses", false);
-    if (enabled) {
-      if (!mIceFinished && (iceJustFailed || iceJustSucceeded)) {
-        Telemetry::AccumulateTimeDelta(
-            Telemetry::WEBRTC_HOSTNAME_OBFUSCATION_ENABLED_ICE_DURATION,
-            mIceStartTime, TimeStamp::Now());
-      }
-      if (iceJustSucceeded) {
-        Telemetry::ScalarAdd(
-            Telemetry::ScalarID::WEBRTC_HOSTNAMEOBFUSCATION_ENABLED_SUCCEEDED,
-            1);
-      } else if (iceJustFailed) {
-        Telemetry::ScalarAdd(
-            Telemetry::ScalarID::WEBRTC_HOSTNAMEOBFUSCATION_ENABLED_FAILED, 1);
-      }
-    } else {
-      if (!mIceFinished && (iceJustFailed || iceJustSucceeded)) {
-        Telemetry::AccumulateTimeDelta(
-            Telemetry::WEBRTC_HOSTNAME_OBFUSCATION_DISABLED_ICE_DURATION,
-            mIceStartTime, TimeStamp::Now());
-      }
-      if (iceJustSucceeded) {
-        Telemetry::ScalarAdd(
-            Telemetry::ScalarID::WEBRTC_HOSTNAMEOBFUSCATION_DISABLED_SUCCEEDED,
-            1);
-      } else if (iceJustFailed) {
-        Telemetry::ScalarAdd(
-            Telemetry::ScalarID::WEBRTC_HOSTNAMEOBFUSCATION_DISABLED_FAILED, 1);
-      }
-    }
-    if (iceJustFailed || iceJustSucceeded) {
-      mIceFinished = true;
-    }
-  }
-
   WrappableJSErrorResult rv;
   mPCObserver->OnStateChange(PCObserverStateType::IceConnectionState, rv);
 }

media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h

@@ -626,9 +626,6 @@ class PeerConnectionImpl final
   mozilla::TimeStamp mIceStartTime;
   // Start time of call used for Telemetry
   mozilla::TimeStamp mStartTime;
-  // Flag if we have transitioned from checking to connected or failed, used
-  // for Telemetry
-  bool mIceFinished = false;
 
   bool mHaveConfiguredCodecs;
 

toolkit/components/telemetry/Histograms.json

@@ -10118,28 +10118,6 @@
     "n_values": 8,
     "description": "Type of call: (Bitmask) Audio = 1, Video = 2, DataChannels = 4"
   },
-  "WEBRTC_HOSTNAME_OBFUSCATION_ENABLED_ICE_DURATION": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "geckoview"],
-    "alert_emails": ["dminor@mozilla.com"],
-    "expires_in_version": "77",
-    "kind": "exponential",
-    "high": 600,
-    "n_buckets": 100,
-    "bug_numbers": [1569250],
-    "description": "The length of time (in seconds) for the ICE state to transition from checking to connected or failed when hostname obfuscation is enabled."
-  },
-  "WEBRTC_HOSTNAME_OBFUSCATION_DISABLED_ICE_DURATION": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "geckoview"],
-    "alert_emails": ["dminor@mozilla.com"],
-    "expires_in_version": "77",
-    "kind": "exponential",
-    "high": 600,
-    "n_buckets": 100,
-    "bug_numbers": [1569250],
-    "description": "The length of time (in seconds) for the ICE state to transition from checking to connected or failed when hostname obfuscation is disabled."
-  },
   "MEDIA_RECORDER_RECORDING_DURATION": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec", "geckoview"],

toolkit/components/telemetry/Scalars.yaml

@@ -941,83 +941,6 @@ preferences:
     record_in_processes:
       - 'main'
 
-webrtc.hostnameobfuscation:
-  disabled_failed:
-    bug_numbers:
-      - 1569250
-    description: >
-      The number of times the connection failed with hostname obfuscation
-      disabled. Hostname obfuscation uses mDNS addresses to prevent browser
-      fingerprinting by using WebRTC to collect local IP addresses.
-    expires: "77"
-    kind: uint
-    notification_emails:
-      - dminor@mozilla.com
-    release_channel_collection: opt-in
-    products:
-      - 'firefox'
-      - 'geckoview'
-    record_in_processes:
-      - 'main'
-      - 'content'
-
-  disabled_succeeded:
-    bug_numbers:
-      - 1569250
-    description: >
-      The number of times the connection succeeded with hostname obfuscation
-      disabled. Hostname obfuscation uses mDNS addresses to prevent browser
-      fingerprinting by using WebRTC to collect local IP addresses.
-    expires: "77"
-    kind: uint
-    notification_emails:
-      - dminor@mozilla.com
-    release_channel_collection: opt-in
-    products:
-      - 'firefox'
-      - 'geckoview'
-    record_in_processes:
-      - 'main'
-      - 'content'
-
-  enabled_failed:
-    bug_numbers:
-      - 1569250
-    description: >
-      The number of times the connection failed with hostname obfuscation
-      enabled. Hostname obfuscation uses mDNS addresses to prevent browser
-      fingerprinting by using WebRTC to collect local IP addresses.
-    expires: "77"
-    kind: uint
-    notification_emails:
-      - dminor@mozilla.com
-    release_channel_collection: opt-in
-    products:
-      - 'firefox'
-      - 'geckoview'
-    record_in_processes:
-      - 'main'
-      - 'content'
-
-  enabled_succeeded:
-    bug_numbers:
-      - 1569250
-    description: >
-      The number of times the connection succeeded with hostname obfuscation
-      enabled. Hostname obfuscation uses mDNS addresses to prevent browser
-      fingerprinting by using WebRTC to collect local IP addresses.
-    expires: "77"
-    kind: uint
-    notification_emails:
-      - dminor@mozilla.com
-    release_channel_collection: opt-in
-    products:
-      - 'firefox'
-      - 'geckoview'
-    record_in_processes:
-      - 'main'
-      - 'content'
-
 webrtc.video:
   recv_codec_used:
     bug_numbers: