Commit 43975ce6 authored by Kershaw Chang's avatar Kershaw Chang
Browse files

Bug 1831041 - Onle record TRR telemetry when DoH mode is 2 or 3, r=valentin,necko-reviewers 

Differential Revision: https://phabricator.services.mozilla.com/D176988
parent 6250f037

netwerk/dns/nsHostRecord.cpp

+39 −34
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ void AddrHostRecord::ResolveComplete() { 
                    : Telemetry::LABELS_DNS_LOOKUP_DISPOSITION3::trrFail);

  }



  if (nsHostResolver::Mode() == nsIDNSService::MODE_TRRFIRST ||

      nsHostResolver::Mode() == nsIDNSService::MODE_TRRONLY) {

    MOZ_ASSERT(mTRRSkippedReason != mozilla::net::TRRSkippedReason::TRR_UNSET);



    Telemetry::Accumulate(Telemetry::TRR_SKIP_REASON_TRR_FIRST2,
@@ -334,7 +336,8 @@ void AddrHostRecord::ResolveComplete() { 
        Telemetry::Accumulate(

            mNativeSuccess ? Telemetry::TRR_RELEVANT_SKIP_REASON_NATIVE_SUCCESS

                           : Telemetry::TRR_RELEVANT_SKIP_REASON_NATIVE_FAILED,

          TRRService::ProviderKey(), static_cast<uint32_t>(mTRRSkippedReason));

            TRRService::ProviderKey(),

            static_cast<uint32_t>(mTRRSkippedReason));

      }

    }
@@ -353,7 +356,8 @@ void AddrHostRecord::ResolveComplete() { 
                              static_cast<uint32_t>(mFirstTRRSkippedReason));

      }



    Telemetry::Accumulate(Telemetry::TRR_SKIP_REASON_STRICT_MODE, telemetryKey,

      Telemetry::Accumulate(Telemetry::TRR_SKIP_REASON_STRICT_MODE,

                            telemetryKey,

                            static_cast<uint32_t>(mTRRSkippedReason));



      if (mTRRSuccess) {
@@ -361,6 +365,7 @@ void AddrHostRecord::ResolveComplete() { 
                              TRRService::ProviderKey(), mTrrAttempts);

      }

    }

  }



  if (mEffectiveTRRMode == nsIRequest::TRR_FIRST_MODE) {

    if (flags & nsIDNSService::RESOLVE_DISABLE_TRR) {