Migrating and isolating google analytics to tolerate failure to load

jstests/tests/test_analytics.js

@@ -1,17 +1,29 @@
 define(function(require) {
     "use strict";
-    var analytics = require("analytics");
+    var gamodule = require("gamodule");
 
     QUnit.module("Google Analytics");
     QUnit.test("test without analytics", function (assert) {
+        var result=[];
+        window.ga = function(cmd, id, auto) {
+            result[0] = [cmd, id, auto];
+        };
         window.apidata.analytics = undefined;
-        var ga = analytics.init();
-        assert.equal(window.ga.l, undefined);
+        var ga = gamodule.init();
+        assert.notEqual(ga, undefined);
+        assert.equal(result.length, 0);
     });
 
     QUnit.test("test with analytics", function (assert) {
+        var result=[];
+        window.ga = function(cmd, id, auto) {
+            result[0] = [cmd, id, auto];
+        };
         window.apidata.analytics = {"tracking_id": "X"};
-        var ga = analytics.init();
-        assert.notEqual(window.ga.l, undefined);
+        var ga = gamodule.init();
+        assert.notEqual(ga, undefined);
+        assert.equal(result[0][0], "create");
+        assert.equal(result[0][1], "X");
+        assert.equal(result[0][2], "auto");
     });
 });

remoteappmanager/static/js/gamodule.js

@@ -0,0 +1,26 @@
+// This module contains the setup for google analytics.
+// MUST not be renamed to analytics. Some blockers rely on name 
+// matching to prevent loading.
+define([
+], function () {
+    "use strict";
+
+    function init() {
+        var module;
+
+        if (window.apidata.analytics !== undefined) {
+            window.ga('create', window.apidata.analytics.tracking_id, 'auto');
+        } else {
+            window.ga = function () {
+            };
+        }
+        module = function () {
+            window.ga.apply(this, arguments);
+        };
+        return module;
+    } 
+
+    return {
+        init: init
+    };
+});

remoteappmanager/static/js/home/controller.js

@@ -3,7 +3,7 @@ require([
     "jquery", 
     "urlutils", 
     "dialogs",
-    "analytics",
+    "gamodule",
     "home/models", 
     "home/views/application_list_view",
     "home/views/application_view",
@@ -14,7 +14,7 @@ require([
     $, 
     urlutils, 
     dialogs, 
-    analytics, 
+    gamodule, 
     models, 
     application_list_view,
     application_view, 
@@ -23,7 +23,7 @@ require([
     init) {
     "use strict";
 
-    var ga = analytics.init();
+    var ga = gamodule.init();
     init.handlebars();
 
     // This model keeps the retrieved content from the REST query locally.

remoteappmanager/templates/page.html

@@ -41,6 +41,18 @@
   {% endblock %}
 
   {% block script %}
+    <script type="text/javascript">
+      // This will always be executed and create the basic ga function that
+      // does nothing
+      window.ga = function () {
+        (window.ga.q = window.ga.q || []).push(arguments);
+      };
+      window.ga.l = 1 * new Date();
+      window.GoogleAnalyticsObject = "ga";
+    </script>
+    {% if analytics %}
+    <script src='https://www.google-analytics.com/analytics.js' async type="text/javascript"></script>
+    {% endif %}
     <script src="{{static_url("components/requirejs/require.js") }}" type="text/javascript" charset="utf-8"></script>
   {% endblock %}