+
+You can click on the various groups to drill down to eventually see the actual requests that are running slowly. This visualisation can be useful for benchmarking an application over versions or time to see if performance improves or degrades.
+
## Configuration
### Authentication/Authorisation
diff --git a/project/example_app/views.py b/project/example_app/views.py
index 749a2814..6ed9921b 100644
--- a/project/example_app/views.py
+++ b/project/example_app/views.py
@@ -9,7 +9,7 @@
def index(request):
@silk_profile()
def do_something_long():
- sleep(1.345)
+ sleep(0.345)
with silk_profile(name='Why do this take so long?'):
do_something_long()
diff --git a/project/project/settings.py b/project/project/settings.py
index c3694cf8..9263f7e5 100644
--- a/project/project/settings.py
+++ b/project/project/settings.py
@@ -128,3 +128,5 @@
# SILKY_AUTHENTICATION = True
# SILKY_AUTHORISATION = True
+SILKY_DISTRIBUTION_TAB = True
+
diff --git a/screenshots/1.png b/screenshots/1.png
index 4b261b18..58704e1f 100644
Binary files a/screenshots/1.png and b/screenshots/1.png differ
diff --git a/screenshots/11.png b/screenshots/11.png
new file mode 100644
index 00000000..18f6f236
Binary files /dev/null and b/screenshots/11.png differ
diff --git a/silk/config.py b/silk/config.py
index 0f8a755d..be3ecb44 100644
--- a/silk/config.py
+++ b/silk/config.py
@@ -3,6 +3,7 @@
from silk.singleton import Singleton
+
def default_permissions(user):
if user:
return user.is_staff
@@ -29,6 +30,9 @@ class SilkyConfig(metaclass=Singleton):
'SILKY_PYTHON_PROFILER_FUNC': None,
'SILKY_STORAGE_CLASS': 'silk.storage.ProfilerResultStorage',
'SILKY_MIDDLEWARE_CLASS': 'silk.middleware.SilkyMiddleware',
+ 'SILKY_REVISION': '',
+ 'SILKY_POST_PROCESS_REQUEST': lambda x: None,
+ 'SILKY_DISTRIBUTION_TAB': False,
'SILKY_JSON_ENSURE_ASCII': True,
'SILKY_ANALYZE_QUERIES': False
}
diff --git a/silk/migrations/0008_request_revision.py b/silk/migrations/0008_request_revision.py
new file mode 100644
index 00000000..ffcfa56e
--- /dev/null
+++ b/silk/migrations/0008_request_revision.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.3 on 2017-12-08 12:52
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import silk.storage
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('silk', '0007_sqlquery_identifier'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='request',
+ name='revision',
+ field=models.TextField(blank=True, default=''),
+ ),
+ ]
diff --git a/silk/models.py b/silk/models.py
index 38d47244..39a33097 100644
--- a/silk/models.py
+++ b/silk/models.py
@@ -72,6 +72,7 @@ class Request(models.Model):
meta_time_spent_queries = FloatField(null=True, blank=True)
pyprofile = TextField(blank=True, default='')
prof_file = FileField(max_length=300, blank=True, storage=silk_storage)
+ revision = TextField(blank=True, default='')
# Useful method to create shortened copies of strings without losing start and end context
# Used to ensure path and view_name don't exceed 190 characters
@@ -117,6 +118,30 @@ def time_spent_on_sql_queries(self):
"""
return sum(x.time_taken for x in SQLQuery.objects.filter(request=self))
+ @classmethod
+ def get_date(cls, start_time):
+ return start_time.date()
+
+ @property
+ def date(self):
+ return self.get_date(self.start_time)
+
+ @classmethod
+ def get_hour(cls, start_time):
+ return start_time.strftime('%Y-%m-%d %H')
+
+ @property
+ def hour(self):
+ return self.get_hour(self.start_time)
+
+ @classmethod
+ def get_minute(cls, start_time):
+ return start_time.strftime('%Y-%m-%d %H:%M')
+
+ @property
+ def minute(self):
+ return self.get_minute(self.start_time)
+
@property
def headers(self):
if self.encoded_headers:
@@ -182,6 +207,12 @@ def save(self, *args, **kwargs):
if self.view_name and len(self.view_name) > 190:
self.view_name = self._shorten(self.view_name)
+ config = SilkyConfig()
+
+ self.revision = config.SILKY_REVISION
+
+ config.SILKY_POST_PROCESS_REQUEST(self)
+
super(Request, self).save(*args, **kwargs)
Request.garbage_collect(force=False)
diff --git a/silk/request_filters.py b/silk/request_filters.py
index f0109ed2..616ee8a9 100644
--- a/silk/request_filters.py
+++ b/silk/request_filters.py
@@ -206,16 +206,21 @@ def __init__(self, value):
super(MethodFilter, self).__init__(value, method=value)
-def filters_from_request(request):
+class RevisionFilter(BaseFilter):
+ def __init__(self, value):
+ super(RevisionFilter, self).__init__(value, revision=value)
+
+
+def filters_from_query_dict(query_dict):
raw_filters = {}
- for key in request.POST:
+ for key in query_dict:
splt = key.split('-')
if splt[0].startswith('filter'):
ident = splt[1]
typ = splt[2]
if ident not in raw_filters:
raw_filters[ident] = {}
- raw_filters[ident][typ] = request.POST[key]
+ raw_filters[ident][typ] = query_dict[key]
filters = {}
for ident, raw_filter in raw_filters.items():
value = raw_filter.get('value', '')
@@ -228,4 +233,29 @@ def filters_from_request(request):
filters[ident] = f
except FilterValidationError:
logger.warn('Validation error when processing filter %s(%s)' % (typ, value))
- return filters
+
+
+def get_path_and_filters(request, session_key_request_filters):
+ path = request.GET.get('path', None)
+ raw_filters = request.session.get(session_key_request_filters, {})
+
+ filter_classes = set(x.__name__ for x in BaseFilter.__subclasses__())
+
+ def get_filter_class_parameter(filter_class):
+ without_filter = filter_class.replace('Filter', '')
+ result = without_filter[0].lower() + without_filter[1:]
+ return result
+
+ url_filters = {
+ filter_class: dict(typ=filter_class, value=url_filter)
+ for filter_class in filter_classes
+ for filter_class_parameter in [get_filter_class_parameter(filter_class)]
+ for url_filter in [request.GET.get(filter_class_parameter, None)]
+ if url_filter is not None
+ }
+
+ def make_filters(raw_filters):
+ return [BaseFilter.from_dict(x) for _, x in raw_filters.items()]
+
+ filters = make_filters(dict(raw_filters, **url_filters))
+ return path, raw_filters, filters
\ No newline at end of file
diff --git a/silk/static/silk/js/distribution.js b/silk/static/silk/js/distribution.js
new file mode 100644
index 00000000..f59338da
--- /dev/null
+++ b/silk/static/silk/js/distribution.js
@@ -0,0 +1,177 @@
+/**
+ * Get the view name filter param dictionary for use in generating uri query parameters.
+ * @param viewName
+ */
+function viewNameFilter(viewName) {
+ return {
+ 'viewName': viewName
+ }
+}
+
+/**
+ * Get the revision filter param dictionary for use in generating uri query parameters.
+ * @param revision The revision to filter by.
+ */
+function revisionFilter(revision) {
+ return {
+ 'revision': revision
+ }
+}
+
+/**
+ * Get the date filter param dictionary for use in generating uri query parameters.
+ * @param date The date to filter by.
+ */
+function dateFilter(date) {
+ date = new Date(date);
+ return {
+ 'afterDate': strftime('%Y/%m/%d 00:00', date),
+ 'beforeDate': strftime('%Y/%m/%d 23:59', date)
+ }
+}
+
+/**
+ * Get the group-by parameter dictionary for use in generating uri query parameters.
+ * @param group The attribute which should be used for grouping distribution charts.
+ * @returns {{group-by: *}}
+ */
+function groupBy(group) {
+ return {'group-by': group}
+}
+
+// mapping of filter by parameters to function for generating filter query parameters
+var filterFunctions = {
+ 'view_name': viewNameFilter,
+ 'date': dateFilter,
+ 'revision': revisionFilter
+};
+
+/**
+ * Make URI parameters from a dictionary.
+ * @param obj dictionary to convert to parameters.
+ * @returns {string}
+ */
+function makeURIParameters(obj) {
+ var str = [];
+ for (var p in obj) {
+ if (obj.hasOwnProperty(p)) {
+ str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+ }
+ }
+ return str.join("&");
+}
+
+/**
+ * Initialise the distribution chart.
+ * @param distributionUrl
+ */
+function initChart(distributionUrl) {
+
+ var inputURIParams = $.url('?');
+ var groupByParam = inputURIParams === undefined ? 'date' : inputURIParams.group_by || 'date';
+ var level = inputURIParams === undefined ? 0 : parseInt(inputURIParams.level) || 0;
+ var locationWithoutQuery = location.href.split("?")[0];
+ var filterParams = {};
+ var filterName = '';
+ var filterParamValue = '';
+
+ // parse the input uri parameters to get the filter to apply
+ for (var paramName in inputURIParams) {
+ if (paramName in filterFunctions) {
+ filterName = paramName;
+ var filter = filterFunctions[paramName];
+ filterParamValue = inputURIParams[paramName];
+ filterValue = filter(filterParamValue);
+ filterParams = Object.assign(filterParams, filterValue);
+ }
+ }
+
+ // generate the chart title
+ var viewTitleValue = 'all';
+ var groupTitleValue = 'all';
+ var groupTitle = groupByParam;
+ if (level === 1) {
+ groupTitle = filterName;
+ groupTitleValue = filterParamValue;
+ } else if (level === 2) {
+ viewTitleValue = filterParamValue;
+ }
+ var title = 'view: ' + viewTitleValue + ' | ' +
+ groupTitle + ': ' + groupTitleValue + ''
+ ;
+ $('#title').html(title);
+
+ var groupParams = groupBy(groupByParam);
+ var outputURIParams = makeURIParameters(Object.assign(filterParams, groupParams));
+ var url = [distributionUrl, outputURIParams].join("?");
+
+ d3.csv(url, function (error, data) {
+
+ var maxValue = 0;
+
+ data.forEach(function (d) {
+ d.value = +d.value;
+ if (d.value > maxValue) {
+ maxValue = d.value;
+ }
+ });
+
+ var chart = makeDistroChart({
+ data: data,
+ xName: 'group',
+ yName: 'value',
+ axisLabels: {xAxis: null, yAxis: 'Time Taken (ms)'},
+ selector: "#chart-distro1",
+ chartSize: {height: window.innerHeight - 110, width: window.innerWidth},
+ constrainExtremes: false,
+ margin: {top: 20, right: 20, bottom: 80, left: 60}
+
+ });
+
+ for (const groupName in chart.groupObjs) {
+ const groupObj = chart.groupObjs[groupName];
+ groupObj.g
+ .on('mouseover.opacity', function () {
+ groupObj.g.transition().duration(300).attr('opacity', 0.5).style('cursor', 'pointer');
+ })
+ .on('mouseout.opacity', function () {
+ groupObj.g.transition().duration(300).attr('opacity', 1).style('cursor', 'default');
+ return false;
+ })
+ .on('click.opacity', function () {
+ var outputLinkParams = Object.assign({}, inputURIParams);
+ outputLinkParams[groupByParam] = groupName;
+ if (level === 0) {
+ outputLinkParams['group_by'] = 'view_name';
+ outputLinkParams['level'] = 1;
+ window.location = [locationWithoutQuery, makeURIParameters(outputLinkParams)].join('?');
+ }
+ else if (level === 1) {
+ outputLinkParams['group_by'] = filterName;
+ outputLinkParams['level'] = 2;
+ delete outputLinkParams[filterName];
+ window.location = [locationWithoutQuery, makeURIParameters(outputLinkParams)].join('?');
+ }
+ else {
+ // go to normal silk view
+ outputLinkParams = {
+ viewName: filterParamValue
+ };
+ if (groupParams['group-by'] === 'date') {
+ outputLinkParams['afterDate'] = strftime('%Y/%m/%d 00:00', new Date(groupName));
+ outputLinkParams['beforeDate'] = strftime('%Y/%m/%d 23:59', new Date(groupName));
+ }
+ else if (groupParams['group-by'] === 'revision') {
+ outputLinkParams['revision'] = groupName;
+ }
+ window.location = ['/silk/requests', makeURIParameters(outputLinkParams)].join('?');
+ }
+ })
+ ;
+ }
+
+ chart.renderBoxPlot();
+
+ // TODO: Maybe a linear regression to show a simple trend line?
+ });
+}
diff --git a/silk/static/silk/lib/d3.v3.min.js b/silk/static/silk/lib/d3.v3.min.js
new file mode 100644
index 00000000..16648730
--- /dev/null
+++ b/silk/static/silk/lib/d3.v3.min.js
@@ -0,0 +1,5 @@
+!function(){function n(n){return n&&(n.ownerDocument||n.document||n).documentElement}function t(n){return n&&(n.ownerDocument&&n.ownerDocument.defaultView||n.document&&n||n.defaultView)}function e(n,t){return t>n?-1:n>t?1:n>=t?0:NaN}function r(n){return null===n?NaN:+n}function i(n){return!isNaN(n)}function u(n){return{left:function(t,e,r,i){for(arguments.length<3&&(r=0),arguments.length<4&&(i=t.length);i>r;){var u=r+i>>>1;n(t[u],e)<0?r=u+1:i=u}return r},right:function(t,e,r,i){for(arguments.length<3&&(r=0),arguments.length<4&&(i=t.length);i>r;){var u=r+i>>>1;n(t[u],e)>0?i=u:r=u+1}return r}}}function o(n){return n.length}function a(n){for(var t=1;n*t%1;)t*=10;return t}function l(n,t){for(var e in t)Object.defineProperty(n.prototype,e,{value:t[e],enumerable:!1})}function c(){this._=Object.create(null)}function f(n){return(n+="")===bo||n[0]===_o?_o+n:n}function s(n){return(n+="")[0]===_o?n.slice(1):n}function h(n){return f(n)in this._}function p(n){return(n=f(n))in this._&&delete this._[n]}function g(){var n=[];for(var t in this._)n.push(s(t));return n}function v(){var n=0;for(var t in this._)++n;return n}function d(){for(var n in this._)return!1;return!0}function y(){this._=Object.create(null)}function m(n){return n}function M(n,t,e){return function(){var r=e.apply(t,arguments);return r===t?n:r}}function x(n,t){if(t in n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(var e=0,r=wo.length;r>e;++e){var i=wo[e]+t;if(i in n)return i}}function b(){}function _(){}function w(n){function t(){for(var t,r=e,i=-1,u=r.length;++i