Skip to content

Commit

Permalink
feat(mustCollect): move mustCollect to cls session
Browse files Browse the repository at this point in the history
  • Loading branch information
peteyycz committed Dec 2, 2015
1 parent 5afdb48 commit e6ceda2
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions lib/providers/httpTransaction/wraps/http.Server.prototype.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function wrapListener (listener, collector, config) {
var ignoreHeaders = config.ignoreHeaders

return function (request, response) {
var mustCollect
var session = getNamespace('trace')
var serverRecieveTime

var headers = request.headers
Expand All @@ -36,7 +36,10 @@ function wrapListener (listener, collector, config) {

var requestId = headers['request-id'] || requestQuery

mustCollect = headers['X-Must-Collect']
var mustCollectHeader = headers['X-Must-Collect']
if (mustCollectHeader) {
session.set('mustCollect', mustCollectHeader)
}

if (!requestId) {
requestId = uuid.v1()
Expand All @@ -54,8 +57,6 @@ function wrapListener (listener, collector, config) {
headers: headers
}

var session = getNamespace('trace')

// Collect request start
process.nextTick(function () {
collector.emit(Collector.SERVER_RECV, collectorDataBag)
Expand All @@ -69,7 +70,7 @@ function wrapListener (listener, collector, config) {
var responseTime = serverSendTime - serverRecieveTime

var collectorDataBag = {
mustCollect: mustCollect,
mustCollect: session.get('mustCollect'),
id: requestId,
host: headers.host,
url: requestUrl.pathname,
Expand All @@ -89,7 +90,8 @@ function wrapListener (listener, collector, config) {

response.writeHead = function () {
serverSendTime = microtime.now()
mustCollect = mustCollect || response.statusCode > 399
var mustCollect = session.get('mustCollect') || response.statusCode > 399
session.set('mustCollect', mustCollect)

/* Service name may be unavailable due to uninitialized reporter */
var serviceName = collector.getService()
Expand Down

0 comments on commit e6ceda2

Please sign in to comment.