github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 18:13:40 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #33 from overleaf/em-swagger-fix

Browse source 
Log requests that don't have a route property
This commit is contained in:
Eric Mc Sween 2020-07-06 08:37:26 -04:00 committed by GitHub
commit bf636047a3
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
libraries/metrics/http.coffee
View file

@ -18,36 +18,36 @@ module.exports.monitor = (logger) ->
Metrics.timing("http_request", responseTimeMs, null, {method:req.method, status_code: res.statusCode, path:routePath}) Metrics.timing("http_request", responseTimeMs, null, {method:req.method, status_code: res.statusCode, path:routePath})
if requestSize if requestSize
Metrics.summary("http_request_size_bytes", requestSize, {method:req.method, status_code: res.statusCode, path:routePath}) Metrics.summary("http_request_size_bytes", requestSize, {method:req.method, status_code: res.statusCode, path:routePath})
remoteIp = req.ip || req.socket?.socket?.remoteAddress || req.socket?.remoteAddress remoteIp = req.ip || req.socket?.socket?.remoteAddress || req.socket?.remoteAddress
reqUrl = req.originalUrl || req.url reqUrl = req.originalUrl || req.url
referrer = req.headers['referer'] || req.headers['referrer'] referrer = req.headers['referer'] || req.headers['referrer']
if STACKDRIVER_LOGGING if STACKDRIVER_LOGGING
info = info =
httpRequest: httpRequest:
requestMethod: req.method requestMethod: req.method
requestUrl: reqUrl requestUrl: reqUrl
requestSize: requestSize requestSize: requestSize
status: res.statusCode status: res.statusCode
responseSize: res._headers?["content-length"] responseSize: res._headers?["content-length"]
userAgent: req.headers["user-agent"] userAgent: req.headers["user-agent"]
remoteIp: remoteIp remoteIp: remoteIp
referer: referrer referer: referrer
latency: latency:
seconds: responseTime[0] seconds: responseTime[0]
nanos: responseTime[1] nanos: responseTime[1]
protocol: req.protocol protocol: req.protocol
else else
info = info =
req: req:
url: reqUrl url: reqUrl
method: req.method method: req.method
referrer: referrer referrer: referrer
"remote-addr": remoteIp "remote-addr": remoteIp
"user-agent": req.headers["user-agent"] "user-agent": req.headers["user-agent"]
"content-length": req.headers["content-length"] "content-length": req.headers["content-length"]
res: res:
"content-length": res._headers?["content-length"] "content-length": res._headers?["content-length"]
statusCode: res.statusCode statusCode: res.statusCode
"response-time": responseTimeMs "response-time": responseTimeMs
logger.info(info, "%s %s", req.method, reqUrl) logger.info(info, "%s %s", req.method, reqUrl)
next() next()

2
libraries/metrics/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "metrics-sharelatex", "name": "metrics-sharelatex",
"version": "2.6.2", "version": "2.7.0",
"description": "A drop-in metrics and monitoring module for node.js apps", "description": "A drop-in metrics and monitoring module for node.js apps",
"repository": { "repository": {
"type": "git", "type": "git",