diff --git a/nodes/core/io/21-httpin.js b/nodes/core/io/21-httpin.js
index 1a749e6e0..f210067f3 100644
--- a/nodes/core/io/21-httpin.js
+++ b/nodes/core/io/21-httpin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013,2014 IBM Corp.
+ * Copyright 2013,2015 IBM Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ module.exports = function(RED) {
     var cors = require('cors');
     var jsonParser = express.json();
     var urlencParser = express.urlencoded();
+    var onHeaders = require('on-headers');
 
     function rawBodyParser(req, res, next) {
         if (req._body) { return next(); }
@@ -73,15 +74,35 @@ module.exports = function(RED) {
                 corsHandler = cors(RED.settings.httpNodeCors);
                 RED.httpNode.options(this.url,corsHandler);
             }
+            
+            var metricsHandler = function(req,res,next) { next(); }
 
+            if (this.metric()) {
+                metricsHandler = function(req, res, next) {
+                    var startAt = process.hrtime();
+                    onHeaders(res, function() {
+                        if(res._msgId) {
+                            var diff = process.hrtime(startAt);
+                            var ms = diff[0] * 1e3 + diff[1] * 1e-6;
+                            var metricResponseTime = ms.toFixed(3);
+                            var metricContentLength = res._headers["content-length"];
+                            //assuming that _id has been set for res._metrics in HttpOut node!
+                            node.metric("response.time.millis", {_id:res._msgId} , metricResponseTime);
+                            node.metric("response.content.length.bytes", {_id:res._msgId} , metricContentLength);
+                        }
+                    });
+                    next();
+                };
+            }
+            
             if (this.method == "get") {
-                RED.httpNode.get(this.url,corsHandler,this.callback,this.errorHandler);
+                RED.httpNode.get(this.url,corsHandler,metricsHandler,this.callback,this.errorHandler);
             } else if (this.method == "post") {
-                RED.httpNode.post(this.url,corsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
+                RED.httpNode.post(this.url,corsHandler,metricsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
             } else if (this.method == "put") {
-                RED.httpNode.put(this.url,corsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
+                RED.httpNode.put(this.url,corsHandler,metricsHandler,jsonParser,urlencParser,rawBodyParser,this.callback,this.errorHandler);
             } else if (this.method == "delete") {
-                RED.httpNode.delete(this.url,corsHandler,this.callback,this.errorHandler);
+                RED.httpNode.delete(this.url,corsHandler,metricsHandler,this.callback,this.errorHandler);
             }
 
             this.on("close",function() {
@@ -134,6 +155,8 @@ module.exports = function(RED) {
                         }
                         msg.res.set('content-length', len);
                     }
+                    
+                    msg.res._msgId = msg._id;
                     msg.res.send(statusCode,msg.payload);
                 }
             } else {
@@ -152,6 +175,7 @@ module.exports = function(RED) {
         this.ret = n.ret || "txt";
         var node = this;
         this.on("input",function(msg) {
+            var preRequestTimestamp = process.hrtime();
             node.status({fill:"blue",shape:"dot",text:"requesting"});
             var url;
             if (msg.url) {
@@ -222,7 +246,6 @@ module.exports = function(RED) {
                     opts.headers['content-length'] = Buffer.byteLength(payload);
                 }
             }
-
             var req = ((/^https/.test(url))?https:http).request(opts,function(res) {
                 (node.ret === "bin") ? res.setEncoding('binary') : res.setEncoding('utf8');
                 msg.statusCode = res.statusCode;
@@ -232,6 +255,16 @@ module.exports = function(RED) {
                     msg.payload += chunk;
                 });
                 res.on('end',function() {
+                    if (node.metric()) {
+                        // Calculate request time
+                        var diff = process.hrtime(preRequestTimestamp);
+                        var ms = diff[0] * 1e3 + diff[1] * 1e-6;
+                        var metricRequestDurationMillis = ms.toFixed(3);
+                        node.metric("duration.millis", msg, metricRequestDurationMillis);
+                        if(res.client && res.client.bytesRead) {
+                            node.metric("size.bytes", msg, res.client.bytesRead);
+                        }
+                    }
                     if (node.ret === "bin") {
                         msg.payload = new Buffer(msg.payload,"binary");
                     }
diff --git a/red/log.js b/red/log.js
index 3e0d6e13f..5f6b30b70 100644
--- a/red/log.js
+++ b/red/log.js
@@ -34,14 +34,17 @@ var levelNames = {
     40: "info",
     50: "debug",
     60: "trace",
-    99: "metric",
+    99: "metric"
 }
 
 var logHandlers = [];
 
+var metricsEnabled = false;
+
 var ConsoleLogHandler = function(settings) {
     this.logLevel = levels[settings.level]||levels.info;
     this.metricsOn = settings.metrics||false;
+    metricsEnabled = this.metricsOn;
     
     this.on("log",function(msg) {
         if (this.shouldReportMessage(msg.level)) {
@@ -91,6 +94,10 @@ var log = module.exports = {
     },
     warn: function(msg) {
         log.log({level:log.WARN,msg:msg});
+    },
+    
+    metric: function() {
+        return metricsEnabled;
     }
 }
 
diff --git a/red/nodes/Node.js b/red/nodes/Node.js
index cb8b841ac..af9f31578 100644
--- a/red/nodes/Node.js
+++ b/red/nodes/Node.js
@@ -201,7 +201,13 @@ Node.prototype.error = function(msg) {
     log_helper(this, Log.ERROR, msg);
 };
 
+/**
+ * If called with no args, returns whether metric collection is enabled
+ */
 Node.prototype.metric = function(eventname, msg, metricValue) {
+    if (typeof eventname === "undefined") {
+        return Log.metric();
+    }
     var metrics = {};
     metrics.level = Log.METRIC;
     metrics.nodeid = this.id;