Commit ca47e808 authored by Dorel Luca's avatar Dorel Luca
Browse files

Backed out 2 changesets (bug 1640867) for Network failures on multipe platforms. CLOSED TREE

Backed out changeset 75a1f56ff1ee (bug 1640867)
Backed out changeset a4c770a70516 (bug 1640867)
parent 70902a6f
......@@ -254,16 +254,14 @@ nsresult TRR::SendHTTPRequest() {
gTRRService->IsTRRBlacklisted(mHost, mOriginSuffix, mPB, true)) {
if (mType == TRRTYPE_A) {
// count only blacklist for A records to avoid double counts
Telemetry::Accumulate(Telemetry::DNS_TRR_BLACKLISTED2,
TRRService::AutoDetectedKey(), true);
Telemetry::Accumulate(Telemetry::DNS_TRR_BLACKLISTED, true);
}
// not really an error but no TRR is issued
return NS_ERROR_UNKNOWN_HOST;
}
if (UseDefaultServer() && (mType == TRRTYPE_A)) {
Telemetry::Accumulate(Telemetry::DNS_TRR_BLACKLISTED2,
TRRService::AutoDetectedKey(), false);
Telemetry::Accumulate(Telemetry::DNS_TRR_BLACKLISTED, false);
}
}
......
......@@ -102,17 +102,6 @@ bool TRRService::CheckCaptivePortalIsPassed() {
return result;
}
NS_NAMED_LITERAL_CSTRING(kTRRIsAutoDetectedKey, "(auto-detected)");
NS_NAMED_LITERAL_CSTRING(kTRRNotAutoDetectedKey, "(default)");
// static
const nsCString& TRRService::AutoDetectedKey() {
if (gTRRService && gTRRService->IsUsingAutoDetectedURL()) {
return kTRRIsAutoDetectedKey.AsString();
}
return kTRRNotAutoDetectedKey.AsString();
}
nsresult TRRService::Init() {
MOZ_ASSERT(NS_IsMainThread(), "wrong thread");
if (mInitialized) {
......@@ -906,13 +895,11 @@ void TRRService::TRRIsOkay(enum TrrOkay aReason) {
XRE_IsSocketProcess(),
NS_IsMainThread());
Telemetry::AccumulateCategoricalKeyed(
AutoDetectedKey(),
aReason == OKAY_NORMAL
? Telemetry::LABELS_DNS_TRR_SUCCESS2::Fine
: (aReason == OKAY_TIMEOUT
? Telemetry::LABELS_DNS_TRR_SUCCESS2::Timeout
: Telemetry::LABELS_DNS_TRR_SUCCESS2::Bad));
Telemetry::AccumulateCategorical(
aReason == OKAY_NORMAL ? Telemetry::LABELS_DNS_TRR_SUCCESS::Fine
: (aReason == OKAY_TIMEOUT
? Telemetry::LABELS_DNS_TRR_SUCCESS::Timeout
: Telemetry::LABELS_DNS_TRR_SUCCESS::Bad));
if (aReason == OKAY_NORMAL) {
mTRRFailures = 0;
} else if ((mMode == MODE_TRRFIRST) && (mConfirmationState == CONFIRM_OK)) {
......@@ -973,8 +960,7 @@ AHostResolver::LookupStatus TRRService::CompleteLookup(
// don't accumulate trronly data here since trronly failures are
// handled above by trying again, so counting the successes here would
// skew the numbers
Telemetry::Accumulate(Telemetry::DNS_TRR_NS_VERFIFIED2,
TRRService::AutoDetectedKey(),
Telemetry::Accumulate(Telemetry::DNS_TRR_NS_VERFIFIED,
(mConfirmationState == CONFIRM_OK));
}
mRetryConfirmInterval = 1000;
......
......@@ -35,7 +35,7 @@ class TRRService : public TRRServiceBase,
TRRService();
nsresult Init();
nsresult Start();
bool Enabled(nsIRequest::TRRMode aMode = nsIRequest::TRR_FIRST_MODE);
bool Enabled(nsIRequest::TRRMode aMode);
bool IsConfirmed() { return mConfirmationState == CONFIRM_OK; }
bool AllowRFC1918() { return mRfc1918; }
......@@ -74,9 +74,6 @@ class TRRService : public TRRServiceBase,
already_AddRefed<nsIThread> TRRThread();
bool IsOnTRRThread();
bool IsUsingAutoDetectedURL() { return mURISetByDetection; }
static const nsCString& AutoDetectedKey();
private:
virtual ~TRRService();
......
......@@ -414,66 +414,51 @@ void AddrHostRecord::ResolveComplete() {
uint32_t millis = static_cast<uint32_t>(mNativeDuration.ToMilliseconds());
Telemetry::Accumulate(Telemetry::DNS_NATIVE_LOOKUP_TIME, millis);
}
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
mNativeSuccess ? Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::osOK
: Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::osFail);
AccumulateCategorical(
mNativeSuccess ? Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::osOK
: Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::osFail);
}
if (mTRRUsed) {
if (mTRRSuccess) {
uint32_t millis = static_cast<uint32_t>(mTrrDuration.ToMilliseconds());
Telemetry::Accumulate(Telemetry::DNS_TRR_LOOKUP_TIME2,
TRRService::AutoDetectedKey(), millis);
Telemetry::Accumulate(Telemetry::DNS_TRR_LOOKUP_TIME, millis);
}
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
mTRRSuccess ? Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrOK
: Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrFail);
AccumulateCategorical(
mTRRSuccess ? Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrOK
: Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrFail);
if (mTrrAUsed == OK) {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrAOK);
AccumulateCategorical(Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrAOK);
} else if (mTrrAUsed == FAILED) {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrAFail);
AccumulateCategorical(Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrAFail);
}
if (mTrrAAAAUsed == OK) {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrAAAAOK);
AccumulateCategorical(
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrAAAAOK);
} else if (mTrrAAAAUsed == FAILED) {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION2::trrAAAAFail);
AccumulateCategorical(
Telemetry::LABELS_DNS_LOOKUP_DISPOSITION::trrAAAAFail);
}
}
if (mEffectiveTRRMode == nsIRequest::TRR_FIRST_MODE) {
if (flags & nsIDNSService::RESOLVE_DISABLE_TRR) {
// TRR is disabled on request, which is a next-level back-off method.
Telemetry::Accumulate(Telemetry::DNS_TRR_DISABLED2,
TRRService::AutoDetectedKey(), mNativeSuccess);
Telemetry::Accumulate(Telemetry::DNS_TRR_DISABLED, mNativeSuccess);
} else {
if (mTRRSuccess) {
AccumulateCategoricalKeyed(TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_TRR_FIRST3::TRR);
AccumulateCategorical(Telemetry::LABELS_DNS_TRR_FIRST2::TRR);
} else if (mNativeSuccess) {
if (mTRRUsed) {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_TRR_FIRST3::NativeAfterTRR);
AccumulateCategorical(
Telemetry::LABELS_DNS_TRR_FIRST2::NativeAfterTRR);
} else {
AccumulateCategoricalKeyed(TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_TRR_FIRST3::Native);
AccumulateCategorical(Telemetry::LABELS_DNS_TRR_FIRST2::Native);
}
} else {
AccumulateCategoricalKeyed(
TRRService::AutoDetectedKey(),
Telemetry::LABELS_DNS_TRR_FIRST3::BothFailed);
AccumulateCategorical(Telemetry::LABELS_DNS_TRR_FIRST2::BothFailed);
}
}
}
......
......@@ -129,7 +129,6 @@
#include "mozilla/net/SocketProcessParent.h"
#include "js/Conversions.h"
#include "mozilla/dom/SecFetch.h"
#include "mozilla/net/TRRService.h"
#ifdef MOZ_TASK_TRACER
# include "GeckoTaskTracer.h"
......@@ -7466,11 +7465,6 @@ nsHttpChannel::OnStartRequest(nsIRequest* request) {
Telemetry::Accumulate(Telemetry::HTTP_CHANNEL_ONSTART_SUCCESS,
NS_SUCCEEDED(mStatus));
if (gTRRService && gTRRService->Enabled()) {
Telemetry::Accumulate(Telemetry::HTTP_CHANNEL_ONSTART_SUCCESS_TRR,
TRRService::AutoDetectedKey(), NS_SUCCEEDED(mStatus));
}
if (mRaceCacheWithNetwork) {
LOG(
(" racingNetAndCache - mFirstResponseSource:%d fromCache:%d "
......
......@@ -3122,17 +3122,6 @@
"releaseChannelCollection": "opt-out",
"alert_emails": ["necko@mozilla.com", "ddamjanovic@mozilla.com"]
},
"HTTP_CHANNEL_ONSTART_SUCCESS_TRR" : {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "boolean",
"keyed": true,
"description": "Successfully started HTTP channels when TRR is enabled; Keyed by TRR auto-detected",
"bug_numbers": [1640867],
"releaseChannelCollection": "opt-out",
"alert_emails": ["necko@mozilla.com", "vgosu@mozilla.com"]
},
"HTTP_CONNECTION_ENTRY_CACHE_HIT_1" : {
"record_in_processes": ["main", "content"],
"products": ["firefox", "fennec", "geckoview"],
......@@ -3954,18 +3943,17 @@
"n_buckets": 50,
"description": "Time for a successful DNS resolution (msec)"
},
"DNS_TRR_LOOKUP_TIME2": {
"DNS_TRR_LOOKUP_TIME": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "exponential",
"high": 60000,
"keyed": true,
"releaseChannelCollection": "opt-out",
"alert_emails": ["necko@mozilla.com"],
"bug_numbers": [1434852, 1640867],
"bug_numbers": [1434852],
"n_buckets": 50,
"description": "Time for a completed TRR resolution (msec); Keyed by TRR auto-detected"
"description": "Time for a completed TRR resolution (msec)"
},
"DNS_TRR_PROCESSING_TIME": {
"record_in_processes": ["main"],
......@@ -4049,47 +4037,43 @@
"releaseChannelCollection": "opt-out",
"description": "DNS: success distribution when both native and TRR were used"
},
"DNS_TRR_FIRST3": {
"DNS_TRR_FIRST2": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"alert_emails": ["necko@mozilla.com"],
"expires_in_version": "never",
"kind": "categorical",
"keyed": true,
"labels": ["TRR", "NativeAfterTRR", "Native", "BothFailed"],
"bug_numbers": [1497252, 1640867],
"bug_numbers": [1497252],
"releaseChannelCollection": "opt-out",
"description": "TRR-first mode distribution. 0=Worked, 1=fell back fine after TRR fail, 2=native worked, 3=both failed; Keyed by TRR auto-detected"
"description": "TRR-first mode distribution. 0=Worked, 1=fell back fine after TRR fail, 2=native worked, 3=both failed"
},
"DNS_TRR_DISABLED2": {
"DNS_TRR_DISABLED": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "boolean",
"keyed": true,
"description": "Resolve success rate when in TRR-first and called TRR-disabled (fall-back mode); Keyed by TRR auto-detected",
"bug_numbers": [1472659, 1640867],
"description": "Resolve success rate when in TRR-first and called TRR-disabled (fall-back mode)",
"bug_numbers": [1472659],
"releaseChannelCollection": "opt-out",
"alert_emails": ["necko@mozilla.com"]
},
"DNS_TRR_BLACKLISTED2": {
"DNS_TRR_BLACKLISTED": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "boolean",
"keyed": true,
"description": "DNS check for TRR was blocked by blacklist; Keyed by TRR auto-detected",
"bug_numbers": [1434852, 1640867],
"description": "DNS check for TRR was blocked by blacklist",
"bug_numbers": [1434852],
"alert_emails": ["necko@mozilla.com"]
},
"DNS_TRR_NS_VERFIFIED2": {
"DNS_TRR_NS_VERFIFIED": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "boolean",
"keyed": true,
"description": "TRR managed to verify NS entry; Keyed by TRR auto-detected",
"bug_numbers": [1453825, 1640867],
"description": "TRR managed to verify NS entry",
"bug_numbers": [1453825],
"alert_emails": ["necko@mozilla.com"]
},
"DNS_TRR_REQUEST_PER_CONN": {
......@@ -4103,15 +4087,14 @@
"bug_numbers": [1470853],
"description": "Number of DOH requests per connection"
},
"DNS_TRR_SUCCESS2": {
"DNS_TRR_SUCCESS": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"expires_in_version": "never",
"kind": "categorical",
"keyed": true,
"labels": ["Fine", "Timeout", "Bad"],
"description": "How often TRR (Trusted Recursive Resolver) requests are fine, time-out or error. Keyed by TRR auto-detected",
"bug_numbers": [1497438, 1640867],
"description": "How often TRR (Trusted Recursive Resolver) requests are fine, time-out or error.",
"bug_numbers": [1497438],
"releaseChannelCollection": "opt-out",
"alert_emails": ["necko@mozilla.com"]
},
......@@ -4135,18 +4118,17 @@
"bug_numbers": [1434852],
"description": "DNS: lookup algorithm"
},
"DNS_LOOKUP_DISPOSITION2": {
"DNS_LOOKUP_DISPOSITION": {
"record_in_processes": ["main"],
"products": ["firefox", "fennec", "geckoview"],
"alert_emails": ["necko@mozilla.com"],
"expires_in_version": "never",
"kind": "categorical",
"keyed": true,
"labels": ["trrOK", "trrFail", "trrAOK", "trrAFail",
"trrAAAAOK", "trrAAAAFail", "osOK", "osFail"],
"bug_numbers": [1434852, 1640867],
"bug_numbers": [1434852],
"releaseChannelCollection": "opt-out",
"description": "DNS: lookup algorithm; Keyed by TRR auto-detected"
"description": "DNS: lookup algorithm"
},
"DNS_RENEWAL_TIME": {
"record_in_processes": ["main"],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment