Merge pull request #211 from CartoDB/CDB-3659

Remove some metrics

NEWS.md

@@ -4,6 +4,7 @@
 Enhancements:
  - Upgrades windshaft
  - Supports `!scale_denominator!` dynamic param in SQL queries
+ - Metrics revamp: removes and adds some metrics
 
 1.16.1 -- 2014-08-19
 --------------------

docs/metrics.md

@@ -4,8 +4,6 @@ See [Windshaft metrics documentation](https://github.com/CartoDB/Windshaft/blob/
 
 The next list includes the API endpoints, each endpoint may have several inner timers, some of them are displayed within this list as subitems. Find the description for them in the Inner timers section.
 ## Timers
-- **windshaft-cartodb.get_infowindow**: time to retrieve an infowindow popup
-- **windshaft-cartodb.get_map_metadata**: time to retrieve metadata for embedded maps
 - **windshaft-cartodb.flush_cache**: time to flush the tile and sql cache
 - **windshaft-cartodb.get_template**: time to retrieve an specific template
 - **windshaft-cartodb.delete_template**: time to delete an specific template
@@ -30,8 +28,6 @@ Again, each inner timer may have several inner timers.
 - **authorizedByAPIKey**: time to authorize using an API KEY
 - **authorizedByCert**: time to authorize a request by a cert, see [signed map](https://github.com/CartoDB/Windshaft-cartodb/wiki/Signed-maps)
 - **authorizedBySigner**: time to authorize a request for a [signed map](https://github.com/CartoDB/Windshaft-cartodb/wiki/Signed-maps)
-- **cartoData.getTableGeometryType**: time to retrieve from redis the geom type for a given table
-- **cors**: time to set the CORS headers
 - **findLastUpdated**: time to retrieve the last update time for a list of tables, see *affectedTables*
 - **fingerPrint**: time to create a fingerprint for a signed map
 - **generateCacheChannel**: time to generate the headers for the cache channel based on the request, see *addCacheChannel*

lib/cartodb/cartodb_windshaft.js

@@ -137,9 +137,6 @@ var CartodbWindshaft = function(serverOptions) {
      * Helper to allow access to the layer to be used in the maps infowindow popup.
      */
     ws.get(serverOptions.base_url + '/infowindow', function(req, res){
-        if ( req.profiler && req.profiler.statsd_client ) {
-          req.profiler.start('windshaft-cartodb.get_infowindow');
-        }
         ws.doCORS(res);
         Step(
             function(){
@@ -161,9 +158,6 @@ var CartodbWindshaft = function(serverOptions) {
      * Helper to allow access to metadata to be used in embedded maps.
      */
     ws.get(serverOptions.base_url + '/map_metadata', function(req, res){
-        if ( req.profiler && req.profiler.statsd_client ) {
-          req.profiler.start('windshaft-cartodb.get_map_metadata');
-        }
         ws.doCORS(res);
         Step(
             function(){
@@ -492,7 +486,6 @@ var CartodbWindshaft = function(serverOptions) {
     // Instantiate a template
     function instanciateTemplate(req, res, template_params, callback) {
       ws.doCORS(res);
-      if ( req.profiler ) req.profiler.done('cors');
       var that = this;
       var response = {};
       var template;

lib/cartodb/server_options.js

@@ -718,7 +718,6 @@ module.exports = function(){
                 cartoData.getTableGeometryType(req.params.dbname, req.params.table, this);
             },
             function finishSetup(err, data){
-                if (req.profiler) req.profiler.done('cartoData.getTableGeometryType');
                 if ( err ) { callback(err, req); return; }
 
                 if (!_.isNull(data))