Domain Reliability: Include config_version in uploads

Domain Reliability: Include config_version in uploads

Echo the config's version in uploads based on the config, so the server
can judge what frequency/type of reports to expect.

BUG=356791
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271466

[Deprecated (see juliatuttle), 2014-05-15 22:26:23]

PTAL, davidben.

[davidben, 2014-05-16 16:16:32]

LGTM. For completeness, an alternative approach for minimalism could be to
include a version in the collector URL and change that every time you bump
versions interestingly.

[Deprecated (see juliatuttle), 2014-05-16 16:21:22]

On 2014/05/16 16:16:32, David Benjamin wrote:
> LGTM. For completeness, an alternative approach for minimalism could be to
> include a version in the collector URL and change that every time you bump
> versions interestingly.

Ooh, that's a good point. Remember it for the standards phase; we might be able
to drop the version field entirely.

[Deprecated (see juliatuttle), 2014-05-16 16:21:27]

The CQ bit was checked by ttuttle@chromium.org

[commit-bot: I haz the power, 2014-05-16 16:21:43]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ttuttle@chromium.org/290473005/1

[commit-bot: I haz the power, 2014-05-16 17:54:38]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-16 17:54:39]

Failed to apply patch for components/domain_reliability/context_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file components/domain_reliability/context_unittest.cc
  Hunk #1 FAILED at 138.
  Hunk #2 succeeded at 158 (offset -36 lines).
  1 out of 2 hunks FAILED -- saving rejects to file
components/domain_reliability/context_unittest.cc.rej

Patch:       components/domain_reliability/context_unittest.cc
Index: components/domain_reliability/context_unittest.cc
diff --git a/components/domain_reliability/context_unittest.cc
b/components/domain_reliability/context_unittest.cc
index
bcd1ac67be398c5f4d50e60f3173791945172625..d0645d80e7f92faa7f85de9e2f761a203c6af1de
100644
--- a/components/domain_reliability/context_unittest.cc
+++ b/components/domain_reliability/context_unittest.cc
@@ -138,6 +138,8 @@ class DomainReliabilityContextTest : public testing::Test {
     collector->upload_url = GURL("https://example/upload");
     config->collectors.push_back(collector);
 
+    config->version = "1";
+
     return scoped_ptr<const DomainReliabilityConfig>(config);
   }
 
@@ -194,7 +196,9 @@ TEST_F(DomainReliabilityContextTest, ReportUpload) {
   DomainReliabilityBeacon beacon = MakeBeacon(&time_);
   context_.OnBeacon(url, beacon);
 
-  const char* kExpectedReport = "{\"reporter\":\"test-reporter\","
+  // N.B.: Assumes max_delay is 5 minutes.
+  const char* kExpectedReport = "{\"config_version\":\"1\","
+      "\"reporter\":\"test-reporter\","
       "\"resource_reports\":[{\"beacons\":[{\"http_response_code\":200,"
       "\"request_age_ms\":300250,\"request_elapsed_ms\":250,\"server_ip\":"
       "\"127.0.0.1\",\"status\":\"ok\"}],\"failed_requests\":0,"

[Deprecated (see juliatuttle), 2014-05-19 17:48:08]

The CQ bit was checked by ttuttle@chromium.org

[commit-bot: I haz the power, 2014-05-19 17:48:19]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/ttuttle@chromium.org/290473005/20001

[commit-bot: I haz the power, 2014-05-19 19:28:04]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  linux_chromium_chromeos_rel on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)

[commit-bot: I haz the power, 2014-05-19 20:39:02]

Change committed as 271466