Merge pull request #525 from Financial-Times/bye-bye-metrics

Remove asset size metrics from deploy-hashed-assets / deploy-static

package.json

@@ -25,7 +25,6 @@
     "isomorphic-fetch": "^2.0.0",
     "md5-file": "^3.1.0",
     "mime": "^1.3.4",
-    "next-metrics": "^1.48.18",
     "node-vault": "^0.5.6",
     "nodemon": "^1.11.0",
     "semver": "^5.0.3",

tasks/deploy-hashed-assets.js

@@ -7,7 +7,6 @@ const readFile = denodeify(require('fs').readFile);
 const waitForOk = require('../lib/wait-for-ok');
 const path = require('path');
 const aws = require('aws-sdk');
-const Metrics = require('next-metrics').Metrics;
 
 const AWS_ACCESS_HASHED_ASSETS = process.env.AWS_ACCESS_HASHED_ASSETS || process.env.aws_access_hashed_assets;
 const AWS_SECRET_HASHED_ASSETS = process.env.AWS_SECRET_HASHED_ASSETS || process.env.aws_secret_hashed_assets;
@@ -59,16 +58,6 @@ function task (opts) {
 
 	const app = normalizeName(packageJson.name, { version: false });
 
-	const metrics = new Metrics;
-	metrics.init({
-		platform: 's3',
-		app: app,
-		instance: false,
-		useDefaultAggregators: false,
-		flushEvery: false,
-		forceGraphiteLogging: true
-	});
-
 	console.log('Deploying hashed assets to S3...'); // eslint-disable-line no-console
 
 	return Promise.all(Object.keys(assetHashes)
@@ -121,15 +110,10 @@ function task (opts) {
 								const contentSize = Buffer.byteLength(content);
 								const gzippedContentSize = Buffer.byteLength(values[2]);
 								console.log(`${file} is ${contentSize} bytes (${gzippedContentSize} bytes gzipped)`); // eslint-disable-line no-console
-								metrics.count(`${file}.size`, contentSize);
-								metrics.count(`${file}.gzip_size`, gzippedContentSize);
 							});
 					});
 			})
-		)
-		.then(() => {
-			metrics.flush();
-		});
+		);
 }
 
 module.exports = function (program, utils) {

tasks/deploy-static.js

@@ -10,7 +10,6 @@ const path = require('path');
 const co = require('co');
 const md5File = denodeify(require('md5-file'));
 const gzip = denodeify(require('zlib').gzip);
-const Metrics = require('next-metrics').Metrics;
 const isImage = require('is-image');
 const waitForOk = require('../lib/wait-for-ok');
 
@@ -26,17 +25,6 @@ function task (opts) {
 	const destination = opts.destination || '';
 	const bucket = opts.bucket;
 
-	const metrics = new Metrics;
-	metrics.init({
-		platform: 's3',
-		app: opts.bucket,
-		instance: false,
-		useDefaultAggregators: false,
-		flushEvery: false,
-		forceGraphiteLogging: true
-	});
-
-
 	if (files.length < 1) {
 		return Promise.reject('No files found for upload to s3.  (Directories are ignored)');
 	}
@@ -110,17 +98,11 @@ function task (opts) {
 						const contentSize = Buffer.byteLength(content);
 						const gzippedContentSize = Buffer.byteLength(gzipped);
 						console.log(`${key} is ${contentSize} bytes (${gzippedContentSize} bytes gzipped)`); // eslint-disable-line no-console
-						let safeFile = opts.monitorStripDirectories ? key.split('/').pop() : key.replace(/\//g, '.');
-						metrics.count(`${safeFile}.size`, contentSize);
-						metrics.count(`${safeFile}.gzip_size`, gzippedContentSize);
 					});
 				console.log(`Successfully uploaded: ${key}`); // eslint-disable-line no-console
 			}
 		});
-	}))
-		.then(() => {
-			metrics.flush();
-		});
+	}));
 };
 
 module.exports = function (program, utils) {