Count submits & failures

Author: robfromboulder

lib/base_logger.js

@@ -3,7 +3,7 @@
 const http = require('http');
 const https = require('https');
 const os = require('os');
-const url_lib = require('url');
+const urls = require('url');
 const usage_loggers = require('./usage_loggers');
 const zlib = require('zlib');
 
@@ -49,12 +49,40 @@ class BaseLogger {
             this._enabled = false;
         }
 
-        // mark immutable properties
+        // parse and cache url properties
+        if (this._url != null) {
+            try {
+                const target = urls.parse(this._url);
+                this._url_library = target.protocol === 'https' ? https : http;
+                this._url_options = {
+                    host: target.host.split(':')[0],
+                    port: target.port,
+                    path: target.path,
+                    method: 'POST',
+                    headers: {'Content-Encoding': this._skip_compression ? 'identity' : 'deflated'}
+                };
+            } catch (e) {
+                this._url = null;
+                this._url_library = null;
+                this._url_options = null;
+                this._enabled = false;
+            }
+        }
+
+        // finalize internal properties
         this._enableable = (this._queue !== null) || (this._url !== null);
+        this._submit_failures = new Uint32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
+        this._submit_successes = new Uint32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
+
+        // mark immutable properties
         Object.defineProperty(this, '_agent', {configurable: false, writable: false});
         Object.defineProperty(this, '_host', {configurable: false, writable: false});
         Object.defineProperty(this, '_queue', {configurable: false, writable: false});
+        Object.defineProperty(this, '_submit_failures', {configurable: false, writable: false});
+        Object.defineProperty(this, '_submit_successes', {configurable: false, writable: false});
         Object.defineProperty(this, '_url', {configurable: false, writable: false});
+        Object.defineProperty(this, '_url_library', {configurable: false, writable: false});
+        Object.defineProperty(this, '_url_options', {configurable: false, writable: false});
         Object.defineProperty(this, '_version', {configurable: false, writable: false});
     }
 
@@ -157,23 +185,19 @@ class BaseLogger {
         } else {
             return new Promise((resolve, reject) => {
                 try {
-                    const target = url_lib.parse(this._url);
-                    const options = {
-                        host: target.host.split(':')[0],
-                        port: target.port,
-                        path: target.path,
-                        method: 'POST',
-                        headers: {'Content-Encoding': this._skip_compression ? 'identity' : 'deflated'}
-                    };
-                    const lib = target.protocol === 'https' ? https : http;
-                    const request = lib.request(options, (response) => {
+                    const request = this._url_library.request(this._url_options, (response) => {
                         if (response.statusCode === 204) {
+                            Atomics.add(this._submit_successes, 0, 1);
                             resolve(true);
                         } else {
-                            resolve(true);  // todo count as error
+                            Atomics.add(this._submit_failures, 0, 1);
+                            resolve(true);
                         }
                     });
-                    request.on('error', () => resolve(true));  // todo count as error
+                    request.on('error', () => {
+                        Atomics.add(this._submit_failures, 0, 1);
+                        resolve(true);
+                    });
                     if (this._skip_compression) {
                         request.write(msg);
                         request.end();
@@ -184,12 +208,27 @@ class BaseLogger {
                         });
                     }
                 } catch (e) {
-                    resolve(true);  // todo count as error
+                    Atomics.add(this._submit_failures, 0, 1);
+                    resolve(true);
                 }
             });
         }
     }
 
+    /**
+     * Returns count of submissions that failed.
+     */
+    get submit_failures() {
+        return Atomics.load(this._submit_failures, 0);
+    }
+
+    /**
+     * Returns count of submissions that succeeded.
+     */
+    get submit_successes() {
+        return Atomics.load(this._submit_successes, 0);
+    }
+
     /**
      * Returns url destination where messages are sent.
      */

test/base_logger_spec.js

@@ -161,7 +161,10 @@ describe('BaseLogger', () => {
         ];
         const msg = JSON.stringify(message);
         expect(parseable(msg)).to.be.true;
-        return logger.submit(msg);
+        logger.submit(msg).then(() => {
+            expect(logger.submit_failures).to.equal(0);
+            expect(logger.submit_successes).to.equal(1);
+        });
     });
 
     it('submits to demo url via http', () => {
@@ -175,7 +178,10 @@ describe('BaseLogger', () => {
         ];
         const msg = JSON.stringify(message);
         expect(parseable(msg)).to.be.true;
-        return logger.submit(msg);
+        logger.submit(msg).then(() => {
+            expect(logger.submit_failures).to.equal(0);
+            expect(logger.submit_successes).to.equal(1);
+        });
     });
 
     it('submits to demo url without compression', () => {
@@ -191,15 +197,21 @@ describe('BaseLogger', () => {
         ];
         const msg = JSON.stringify(message);
         expect(parseable(msg)).to.be.true;
-        return logger.submit(msg);
+        logger.submit(msg).then(() => {
+            expect(logger.submit_failures).to.equal(0);
+            expect(logger.submit_successes).to.equal(1);
+        });
     });
 
     it('submits to denied url', () => {
         for (let url of helper.MOCK_URLS_DENIED) {
             const logger = new BaseLogger(MOCK_AGENT, {url: url});
             expect(logger.enableable).to.be.true;
             expect(logger.enabled).to.be.true;
-            expect(logger.submit('{}')).to.be.fulfilled;
+            logger.submit('{}').then(() => {
+                expect(logger.submit_failures).to.equal(1);
+                expect(logger.submit_successes).to.equal(0);
+            });
         }
     });
 
@@ -215,6 +227,8 @@ describe('BaseLogger', () => {
         expect(queue.length).to.equal(1);
         expect(logger.submit('{}')).to.be.fulfilled;
         expect(queue.length).to.equal(2);
+        expect(logger.submit_failures).to.equal(0);
+        expect(logger.submit_successes).to.equal(0);
     });
 
     it('silently ignores unexpected option classes', () => {