[#371] Add ConfigurationBuilder for flexible config management

Author: feelform

index.js

@@ -8,11 +8,11 @@
 
 const { AgentBuilder } = require('./lib/agent-builder')
 const AgentInfo = require('./lib/data/dto/agent-info')
-const { getConfig } = require('./lib/config')
+const { getConfig2 } = require('./lib/config')
 const { LogBuilder } = require('./lib/utils/log/log-builder')
 const logger = require('./lib/utils/log/logger')
 
-const config = getConfig()
+const config = getConfig2()
 logger.setRootLogger(LogBuilder.createDefaultLogBuilder().setConfig(config).build())
 
 const agentInfo = AgentInfo.make(config)

lib/agent-builder.js

@@ -16,7 +16,7 @@ const { ModuleHook } = require('./instrumentation/module-hook')
 const Scheduler = require('./utils/scheduler')
 const AgentStatsMonitor = require('./metric/agent-stats-monitor')
 const PingScheduler = require('./metric/ping-scheduler')
-const { getConfig } = require('./config')
+const { getConfig2 } = require('./config')
 
 class Agent {
     constructor(agentInfo, config, logger) {
@@ -117,7 +117,7 @@ class AgentBuilder {
 
     build() {
         if (!this.config) {
-            this.config = getConfig()
+            this.config = getConfig2()
         }
 
         const agent = new Agent(this.agentInfo, this.config, logger)

lib/instrumentation/http/http-status-code-errors-builder.js

@@ -6,7 +6,7 @@
 
 'use strict'
 
-const { getConfig } = require('./../../config')
+const { getConfig2 } = require('./../../config')
 
 class HttpStatusCodeErrors {
     constructor(errors) {
@@ -68,13 +68,18 @@ class HttpStatusCodeErrorsBuilder {
 let httpStatusCodeErrors
 function getHttpStatusCodeErrors() {
     if (!httpStatusCodeErrors) {
-        const config = getConfig()
+        const config = getConfig2()
         httpStatusCodeErrors = new HttpStatusCodeErrorsBuilder(config.httpStatusCodeErrors).build()
     }
     return httpStatusCodeErrors
 }
 
+function clearHttpStatusCodeErrors() {
+    httpStatusCodeErrors = undefined
+}
+
 module.exports = {
     HttpStatusCodeErrorsBuilder,
-    getHttpStatusCodeErrors
+    getHttpStatusCodeErrors,
+    clearHttpStatusCodeErrors
 }

test/config.test.js

@@ -6,7 +6,7 @@
 
 const test = require('tape')
 const { clear2, getConfig2, readConfigJson, readRootConfigFile, getMainModulePath } = require('../lib/config')
-const { HttpStatusCodeErrorsBuilder } = require('../lib/instrumentation/http/http-status-code-errors-builder')
+const { HttpStatusCodeErrorsBuilder, getHttpStatusCodeErrors, clearHttpStatusCodeErrors } = require('../lib/instrumentation/http/http-status-code-errors-builder')
 const log = require('../lib/utils/log/logger')
 
 test('Agent ID required field', function (t) {
@@ -293,6 +293,47 @@ test('HTTP Status Code Errors', (t) => {
   t.end()
 })
 
+test('HTTP Status Code Errors with config changes', (t) => {
+  clear2()
+  clearHttpStatusCodeErrors()
+
+  let httpErrors = getHttpStatusCodeErrors()
+  t.equal(httpErrors.isErrorCode(500), true, 'default: 500 is error code')
+  t.equal(httpErrors.isErrorCode(401), true, 'default: 401 is error code')
+  t.equal(httpErrors.isErrorCode(403), true, 'default: 403 is error code')
+  t.equal(httpErrors.isErrorCode(404), false, 'default: 404 is not error code')
+
+  clear2()
+  clearHttpStatusCodeErrors()
+  process.env['PINPOINT_HTTP_STATUS_CODE_ERRORS'] = '404,500'
+
+  httpErrors = getHttpStatusCodeErrors()
+  t.equal(httpErrors.isErrorCode(500), true, 'env config: 500 is error code')
+  t.equal(httpErrors.isErrorCode(404), true, 'env config: 404 is error code')
+  t.equal(httpErrors.isErrorCode(401), false, 'env config: 401 is not error code')
+  t.equal(httpErrors.isErrorCode(403), false, 'env config: 403 is not error code')
+
+  clear2()
+  clearHttpStatusCodeErrors()
+  delete process.env.PINPOINT_HTTP_STATUS_CODE_ERRORS
+
+  const customConfig = { 'http-status-code': { 'errors': '400,401,403,404' } }
+  const conf = getConfig2(customConfig)
+  t.equal(conf.httpStatusCodeErrors, '400,401,403,404', 'json config: httpStatusCodeErrors value')
+
+  httpErrors = getHttpStatusCodeErrors()
+  t.equal(httpErrors.isErrorCode(400), true, 'json config: 400 is error code')
+  t.equal(httpErrors.isErrorCode(401), true, 'json config: 401 is error code')
+  t.equal(httpErrors.isErrorCode(403), true, 'json config: 403 is error code')
+  t.equal(httpErrors.isErrorCode(404), true, 'json config: 404 is error code')
+  t.equal(httpErrors.isErrorCode(500), false, 'json config: 500 is not error code')
+
+  delete process.env.PINPOINT_HTTP_STATUS_CODE_ERRORS
+  clear2()
+  clearHttpStatusCodeErrors()
+  t.end()
+})
+
 test('Logger levels', (t) => {
   clear2()
   const conf = require('../lib/config').getConfig2()