Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192733
Change subject: webperf: update VE metric module
......................................................................
webperf: update VE metric module
Dramatically simplify things by reporting just 'load' and 'save' under the
VisualEditor namespace.
Change-Id: I28f2957bf1a48b7dc87fa579ddf0db827bf9a69d
---
M modules/webperf/files/ve.py
1 file changed, 20 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/33/192733/1
diff --git a/modules/webperf/files/ve.py b/modules/webperf/files/ve.py
index dd6a1c5..dbebc3f 100644
--- a/modules/webperf/files/ve.py
+++ b/modules/webperf/files/ve.py
@@ -8,7 +8,7 @@
import argparse
import socket
-import zmq
+import eventlogging
ap = argparse.ArgumentParser(description='PerfData StatsD module')
@@ -18,21 +18,26 @@
ap.add_argument('--statsd-port', default=8125, type=int)
args = ap.parse_args()
-ctx = zmq.Context()
-zsock = ctx.socket(zmq.SUB)
-zsock.hwm = 3000
-zsock.linger = 0
-zsock.connect(args.endpoint)
-zsock.subscribe = b''
-
addr = args.statsd_host, args.statsd_port
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-for meta in iter(zsock.recv_json, ''):
- if meta['revision'] == 7254808:
- for point in meta['event']['points'].split(','):
- metric, value = point.split('=')
- stat = '%s:%s|ms' % (metric, value)
+events = eventlogging.connect(args.endpoint)
+
+for meta in events.filter(schema='Edit'):
+ event = meta['event']
+ if event['editor'] == 'visualeditor':
+ try:
+ action = event['action']
+ if action == 'saveSuccess':
+ metric = 'save'
+ elif action == 'ready':
+ metric = 'load'
+ else:
+ continue
+ timing = int(event['action.%s.timing' % action])
+ if timing < 100 or timing > 100000:
+ continue
+ stat = 'VisualEditor.%s:%s|ms' % (metric, timing)
sock.sendto(stat.encode('utf-8'), addr)
- stat = '%s:1|c' % metric
- sock.sendto(stat.encode('utf-8'), addr)
+ except (ValueError, KeyError):
+ continue
--
To view, visit https://gerrit.wikimedia.org/r/192733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28f2957bf1a48b7dc87fa579ddf0db827bf9a69d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
