Skip to content

Commit da9dc2d

Browse files
committed
fix(instrumentation): TRACE_DISABLE_INSTRUMENTATIONS does not set default values
1 parent 3759fa4 commit da9dc2d

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

lib/agent/api/index.spec.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ describe('The Trace CollectorApi module', function () {
5959
})
6060

6161
it('can be instantiated w/ serviceName and apiKey', function () {
62+
CollectorApi.create(defaultConfig)
63+
})
64+
65+
it('can use a proxy', function () {
6266
var httpsRequestSpy = this.sandbox.spy(https, 'request')
6367
defaultConfig.proxy = 'http://127.0.0.1'
64-
var collectorApi = CollectorApi.create(defaultConfig)
6568

6669
var serviceKey = 12
6770

@@ -71,9 +74,6 @@ describe('The Trace CollectorApi module', function () {
7174
pid: 7777
7275
}
7376

74-
var path = util.format(defaultConfig.collectorApiRpmMetricsEndpoint, serviceKey)
75-
var sendUrl = url.resolve(defaultConfig.collectorApiUrl, path)
76-
7777
var collectorApi = CollectorApi.create(defaultConfig)
7878
collectorApi.serviceKey = serviceKey
7979

@@ -83,10 +83,6 @@ describe('The Trace CollectorApi module', function () {
8383
expect(collectorApi.proxyAgent).to.be.ok
8484
})
8585

86-
it('can use a proxy', function () {
87-
var collectorApi = CollectorApi.create(defaultConfig)
88-
})
89-
9086
it('sends rpm metrics to the collector server', function () {
9187
var serviceKey = 12
9288

lib/agent/metrics/custom/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
var debug = require('debug')('risingstack/trace')
2-
31
var Timer = require('../../timer')
42

53
function CustomMetrics (options) {

lib/utils/configReader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ ConfigReader.prototype._getEnvVarConfig = function () {
6262
disableStackTrace: process.env.TRACE_DISABLE_STACK_TRACE == true, // eslint-disable-line
6363
disableInstrumentations: process.env.TRACE_DISABLE_INSTRUMENTATIONS
6464
? process.env.TRACE_DISABLE_INSTRUMENTATIONS.split(',')
65-
: [],
65+
: undefined,
6666
proxy: process.env.TRACE_PROXY
6767
}
6868

lib/utils/configReader.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ describe('Config Reader module', function () {
357357

358358
var config = configReader.getConfig()
359359

360-
expect(config.disableInstrumentations).to.eql([])
360+
expect(config.disableInstrumentations).to.eql(undefined)
361361
})
362362

363363
it('parses list from environment variable', function () {

0 commit comments

Comments
 (0)