Bug 1450098 - Rewrote part of TelemetryScalars' internal_LogScalarError to use nsPrintfCString and defined variables instead of constants; r?Dexter draft
authorMichael Calabrese <mcalabrese85@gmail.com>
Mon, 16 Apr 2018 00:14:32 -0400
changeset 782451 12c38e71e02ee34c6fc3946e286932cea4b6b3c1
parent 782432 7ff499dfcd51cf4a95ebf0db506b415bf7bb27c3
push id106539
push userbmo:mcalabrese85@gmail.com
push dateMon, 16 Apr 2018 04:15:26 +0000
reviewersDexter
bugs1450098
milestone61.0a1
Bug 1450098 - Rewrote part of TelemetryScalars' internal_LogScalarError to use nsPrintfCString and defined variables instead of constants; r?Dexter MozReview-Commit-ID: Kp2WNGzcgqM
toolkit/components/telemetry/TelemetryScalar.cpp
--- a/toolkit/components/telemetry/TelemetryScalar.cpp
+++ b/toolkit/components/telemetry/TelemetryScalar.cpp
@@ -923,26 +923,26 @@ internal_LogScalarError(const nsACString
       break;
     case ScalarResult::InvalidType:
       errorMessage.AppendLiteral(u" - Attempted to set the scalar to an invalid data type.");
       break;
     case ScalarResult::InvalidValue:
       errorMessage.AppendLiteral(u" - Attempted to set the scalar to an incompatible value.");
       break;
     case ScalarResult::StringTooLong:
-      errorMessage.AppendLiteral(u" - Truncating scalar value to 50 characters.");
+			AppendUTF8toUTF16(nsPrintfCString(" - Truncating scalar value to %i characters.", kMaximumStringValueLength), errorMessage);
       break;
     case ScalarResult::KeyIsEmpty:
       errorMessage.AppendLiteral(u" - The key must not be empty.");
       break;
     case ScalarResult::KeyTooLong:
-      errorMessage.AppendLiteral(u" - The key length must be limited to 72 characters.");
+			AppendUTF8toUTF16(nsPrintfCString(" - The key length must be limited to %i characters.", kMaximumKeyStringLength), errorMessage);
       break;
     case ScalarResult::TooManyKeys:
-      errorMessage.AppendLiteral(u" - Keyed scalars cannot have more than 100 keys.");
+			AppendUTF8toUTF16(nsPrintfCString(" - Keyed scalars cannot have more than %i keys.", kMaximumNumberOfKeys), errorMessage);
       break;
     case ScalarResult::UnsignedNegativeValue:
       errorMessage.AppendLiteral(u" - Trying to set an unsigned scalar to a negative number.");
       break;
     case ScalarResult::UnsignedTruncatedValue:
       errorMessage.AppendLiteral(u" - Truncating float/double number.");
       break;
     default: