From 2b2020b43b2dbbb07d51072e15cd3342551dde20 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 25 Aug 2014 19:09:54 +0200 Subject: [PATCH 1/4] Removes getTableGeometryType metric --- docs/metrics.md | 1 - lib/cartodb/server_options.js | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/metrics.md b/docs/metrics.md index a3c3e5b5..de856831 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -30,7 +30,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 diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 47218122..ec91148b 100644 --- a/lib/cartodb/server_options.js +++ b/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)) From f4060013151b5ec0737f7d876bb823290490afb4 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Mon, 25 Aug 2014 19:15:31 +0200 Subject: [PATCH 2/4] Removes get_infowindow and get_map_metadata metrics --- docs/metrics.md | 2 -- lib/cartodb/cartodb_windshaft.js | 6 ------ 2 files changed, 8 deletions(-) diff --git a/docs/metrics.md b/docs/metrics.md index de856831..adfaec57 100644 --- a/docs/metrics.md +++ b/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 diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index a77a56a3..e709e3a7 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/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(){ From 7faff8f88786af7a24c7866b6bf1282bbe101e33 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 26 Aug 2014 11:53:59 +0200 Subject: [PATCH 3/4] Removes cors metric --- docs/metrics.md | 1 - lib/cartodb/cartodb_windshaft.js | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/metrics.md b/docs/metrics.md index adfaec57..5a10c24e 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -28,7 +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) -- **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* diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index e709e3a7..cb6db192 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -486,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; From a084ec19ffa6816f0163ee041d18b852852b1ee4 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Tue, 26 Aug 2014 12:23:56 +0200 Subject: [PATCH 4/4] Update news --- NEWS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS.md b/NEWS.md index 661fbceb..abc0a26b 100644 --- a/NEWS.md +++ b/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 --------------------