Implement a ping uploader

Author: brizental

src/config.ts

@@ -11,7 +11,7 @@ interface Configuration {
   // The user visible version string fro the application running Glean.js.
   readonly appDisplayVersion?: string,
   // The server pings are sent to.
-  readonly serverEndpoint: URL
+  readonly serverEndpoint?: URL
 }
 
 export default Configuration;

src/glean.ts

@@ -6,6 +6,7 @@ import { DEFAULT_TELEMETRY_ENDPOINT } from "./constants";
 import Configuration from "config";
 import MetricsDatabase from "metrics/database";
 import PingsDatabase from "pings/database";
+import PingUploader from "upload";
 import { isUndefined, sanitizeApplicationId } from "utils";
 import { CoreMetrics } from "internal_metrics";
 import { Lifetime } from "metrics";
@@ -25,6 +26,8 @@ class Glean {
   private _initialized: boolean;
   // Instances of Glean's core metrics.
   private _coreMetrics: CoreMetrics;
+  // The ping uploader.
+  private _pingUploader: PingUploader
 
   // Properties that will only be set on `initialize`.
   private _applicationId?: string;
@@ -37,16 +40,21 @@ class Glean {
         Use Glean.instance instead to access the Glean singleton.`);
     }
 
+    this._pingUploader = new PingUploader();
     this._coreMetrics = new CoreMetrics();
     this._initialized = false;
     this._db = {
       metrics: new MetricsDatabase(),
-      pings: new PingsDatabase()
+      pings: new PingsDatabase(this._pingUploader)
     };
     // Temporarily setting this to true always, until Bug 1677444 is resolved.
     this._uploadEnabled = true;
   }
 
+  private static get pingUploader(): PingUploader {
+    return Glean.instance._pingUploader;
+  }
+
   private static get coreMetrics(): CoreMetrics {
     return Glean.instance._coreMetrics;
   }
@@ -77,6 +85,10 @@ class Glean {
     await Glean.coreMetrics.initialize(config?.appBuild, config?.appDisplayVersion);
 
     Glean.instance._initialized = true;
+
+    await Glean.pingUploader.scanPendingPings();
+    // Even though this returns a promise, there is no need to block on it returning.
+    Glean.pingUploader.triggerUpload();
   }
 
   /**
@@ -158,11 +170,15 @@ class Glean {
     Glean.instance._initialized = false;
     // Reset upload enabled state, not to inerfere with other tests.
     Glean.uploadEnabled = true;
+
+    // Stop ongoing jobs and clear pending pings queue.
+    await Glean.pingUploader.clearPendingPingsQueue();
+
     // Clear the databases.
     await Glean.metricsDatabase.clearAll();
     await Glean.pingsDatabase.clearAll();
 
-    // Initialize Glean.
+    // Re-Initialize Glean.
     await Glean.initialize(applicationId, config);
   }
 }

src/upload/adapter/browser.ts

@@ -2,26 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { GLEAN_VERSION } from "../../constants";
 import { UploadAdapter } from ".";
-import { JSONObject } from "utils";
 
 const BrowserUploadAdapter: UploadAdapter = {
   async post(url: URL, options: {
     headers?: Record<string, string>,
-    body: JSONObject
+    body: string
   }): Promise<number> {
     const stringifiedBody = JSON.stringify(options.body);
     const headers = options.headers || {};
     const response = await fetch(url.toString(), {
-      headers: {
-        "Content-Type": "application/json; charset=utf-8",
-        "Content-Length": stringifiedBody.length.toString(),
-        "Date": (new Date()).toISOString(),
-        "X-Client-Type": "Glean.js",
-        "X-Client-Version": GLEAN_VERSION,
-        ...headers
-      },
+      headers,
       body: stringifiedBody,
       keepalive: true
     });

src/upload/adapter/index.ts

@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-import { JSONObject } from "utils";
-
 /**
  * Uploader interface, actualy uploading logic varies per platform.
  */
@@ -18,7 +16,7 @@ export interface UploadAdapter {
    */
   post(url: URL, options: {
     headers?: Record<string, string>,
-    body: JSONObject
+    body: string
   }): Promise<number>;
 }