fix(spans): remove sampling

Author: gergelyke

e2e/reportHttpRequest.spec.js

@@ -63,6 +63,7 @@ test('should report http requests', function (t) {
     // http client request
     request
       .get('127.0.0.1:' + WEB_SERVER_PORT + '/test')
+      .set('x-must-collect', '1')
       .end(function (err) {
         t.error(err, 'client sends request')
       })

lib/agent/index.js

@@ -21,8 +21,6 @@ function Agent (options) {
   // config
   this.config = options.config
   this.collectInterval = this.config.collectInterval
-  this.sampleRate = this.config.initialSampleRate
-  this.sampleSize = this.config.sampleSize
 
   this.totalRequestCount = 0
   this.mustCollectCount = 0
@@ -131,14 +129,13 @@ Agent.prototype.serverSend = function (data) {
     }
   })
 
-  span.isSampled = (1 / this.sampleRate) > Math.random()
   span.isForceSampled = span.isForceSampled || data.mustCollect === consts.MUST_COLLECT.ERROR
 
   if (span.isForceSampled) {
     this.mustCollectCount += 1
   }
 
-  if ((span.isForceSampled || span.isSampled) && this.mustCollectCount <= MUST_COLLECT_LIMIT) {
+  if (span.isForceSampled && (this.mustCollectCount <= MUST_COLLECT_LIMIT)) {
     this.spans.push(span)
   }
 
@@ -392,13 +389,12 @@ Agent.prototype._send = function (options) {
   if (this.spans.length > 0) {
     var dataBag = {
       sample: {
-        rate: this.sampleRate,
-        totalRequestCount: this.totalRequestCount
+        rate: 1,
+        totalRequestCount: 1
       },
       spans: this.spans
     }
 
-    this.sampleRate = Math.floor(this.totalRequestCount / this.sampleSize) || 1
     this.totalRequestCount = 0
 
     this.spans = []

lib/agent/index.spec.js

@@ -78,8 +78,8 @@ describe('The Trace agent', function () {
     expect(agent.totalRequestCount).to.eql(1)
     expect(agent.partials[transactionId]).to.eql({
       requestId: transactionId,
-      isSampled: false,
       isForceSampled: false,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -112,8 +112,8 @@ describe('The Trace agent', function () {
     expect(agent.totalRequestCount).to.eql(1)
     expect(agent.partials[transactionId]).to.eql({
       requestId: transactionId,
-      isSampled: false,
       isForceSampled: false,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -130,7 +130,6 @@ describe('The Trace agent', function () {
 
   it('does server send', function () {
     var statusCode = 200
-    agent.sampleRate = 1
     agent.serverReceive({
       id: transactionId,
       spanId: spanId,
@@ -144,7 +143,8 @@ describe('The Trace agent', function () {
       id: transactionId,
       spanId: spanId,
       responseTime: responseTime,
-      statusCode: statusCode
+      statusCode: statusCode,
+      mustCollect: '1'
     })
 
     expect(rpmMetrics.addResponseTime).to.have.been.calledWith(responseTime)
@@ -153,8 +153,8 @@ describe('The Trace agent', function () {
     expect(agent.partials).to.eql({})
     expect(agent.spans).to.eql([{
       requestId: transactionId,
-      isSampled: true,
-      isForceSampled: false,
+      isForceSampled: true,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -198,8 +198,8 @@ describe('The Trace agent', function () {
     expect(agent.spans).to.eql([])
     expect(agent.partials[transactionId]).to.eql({
       requestId: transactionId,
-      isSampled: false,
       isForceSampled: false,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -240,8 +240,8 @@ describe('The Trace agent', function () {
     expect(agent.spans).to.eql([])
     expect(agent.partials[transactionId]).to.eql({
       requestId: transactionId,
-      isSampled: false,
       isForceSampled: false,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -284,8 +284,8 @@ describe('The Trace agent', function () {
     expect(agent.spans).to.eql([])
     expect(agent.partials[transactionId]).to.eql({
       requestId: transactionId,
-      isSampled: false,
       isForceSampled: false,
+      isSampled: false,
       events: [{
         type: 'sr',
         time: time,
@@ -316,19 +316,16 @@ describe('The Trace agent', function () {
       2,
       3
     ]
-    agent.sampleRate = 2
     agent.totalRequestCount = 6
-    agent.sampleSize = 10
     agent._send()
 
-    expect(agent.sampleRate).to.eql(1)
     expect(agent.totalRequestCount).to.eql(0)
     expect(collectorApi.sendSamples).to.be.calledWith({
+      spans: [1, 2, 3],
       sample: {
-        rate: 2,
-        totalRequestCount: 6
-      },
-      spans: [1, 2, 3]
+        rate: 1,
+        totalRequestCount: 1
+      }
     })
   })
 

lib/config.js

@@ -2,8 +2,6 @@ var url = require('url')
 var config = {}
 
 config.collectInterval = 2 * 60 * 1000
-config.sampleSize = 60
-config.initialSampleRate = 50
 
 config.collectorLanguage = 'nodejs'
 config.collectorApiUrl = 'https://trace-collector-api.risingstack.com'