Forward canary state to error reporting.

And explicitly include non-CDN-state in version for easier filtering.

src/error.js

@@ -130,6 +130,9 @@ export function getErrorReportUrl(message, filename, line, col, error) {
   if (window.context && window.context.location) {
     url += '&3p=1';
   }
+  if (window.AMP_CONFIG && window.AMP_CONFIG.canary) {
+    url += '&ca=1';
+  }
 
   if (error) {
     const tagName = error && error.associatedElement

test/functional/test-error.js

@@ -93,6 +93,20 @@ describe('reportErrorToServer', () => {
     expect(query['3p']).to.equal('1');
   });
 
+  it('reportError marks canary', () => {
+    window.AMP_CONFIG = {
+      canary: true,
+    };
+    const e = new Error('XYZ');
+    e.fromAssert = true;
+    const url = parseUrl(
+        getErrorReportUrl(undefined, undefined, undefined, undefined, e));
+    const query = parseQueryString(url.search);
+
+    expect(query.m).to.equal('XYZ');
+    expect(query['ca']).to.equal('1');
+  });
+
   it('reportError without error object', () => {
     const url = parseUrl(
         getErrorReportUrl('foo bar', 'foo.js', '11', '22', undefined));

tools/errortracker/app.yaml

@@ -1,5 +1,5 @@
 application: amp-error-reporting
-version: 6
+version: 7
 runtime: go
 api_version: go1
 

tools/errortracker/errortracker.go

@@ -116,9 +116,16 @@ func handle(w http.ResponseWriter, r *http.Request) {
 		severity = "ERROR"
 		level = logging.Error
 		errorType += "-cdn"
+	} else {
+		errorType += "-origin"
 	}
 	if r.URL.Query().Get("3p") == "1" {
-		errorType = "-3p"
+		errorType += "-3p"
+	} else {
+		errorType += "-1p"
+	}
+	if r.URL.Query().Get("ca") == "1" {
+		errorType += "-canary"
 	}
 
 	if level != logging.Error && rand.Float32() > 0.01 {