[#404] Configuration Reconstructing

Author: feelform

lib/config-builder.js

@@ -8,6 +8,7 @@
 
 const fs = require('fs')
 const path = require('path')
+const { randomBytes } = require('node:crypto')
 
 class Config {
     constructor(config) {
@@ -19,6 +20,12 @@ class Config {
 class ConfigBuilder {
     constructor(agentStartupUserDefinedJson = {}) {
         this.agentStartupUserDefinedJson = agentStartupUserDefinedJson
+        this.handlers = [
+            new AgentIdGenerator(),
+            new ApplicationNameValidator()
+        ]
+        this.errorMessages = []
+        this.warnMessages = []
     }
 
     setDefaultJson(json) {
@@ -31,6 +38,11 @@ class ConfigBuilder {
         return this
     }
 
+    addHandler(handler) {
+        this.handlers.push(handler)
+        return this
+    }
+
     build() {
         if (!this.defaultJson) {
             this.defaultJson = require('./pinpoint-config-default')
@@ -46,6 +58,11 @@ class ConfigBuilder {
             makeEnvironmentConfig(),
             this.agentStartupUserDefinedJson
         )
+
+        for (const handler of this.handlers) {
+            const changes = handler.handle(config)
+            applyConfigChanges(config, changes)
+        }
         return new Config(config)
     }
 
@@ -64,7 +81,7 @@ class ConfigBuilder {
             const fileContent = fs.readFileSync(configFilePath, 'utf8')
             return JSON.parse(fileContent)
         } catch (e) {
-            console.error('Failed to read or parse pinpoint-config.json:', e)
+            this.warnMessages.push(`Failed to read or parse pinpoint-config.json at ${configFilePath}: ${e.message}`)
             return {}
         }
     }
@@ -81,6 +98,47 @@ class ConfigBuilder {
     }
 }
 
+function applyConfigChanges(target, changes) {
+    if (!changes || typeof changes !== 'object') {
+        return
+    }
+
+    for (const [key, value] of Object.entries(changes)) {
+        if (value === undefined) {
+            continue
+        }
+
+        if (isPlainObject(value) && isPlainObject(target[key])) {
+            applyConfigChanges(target[key], value)
+        } else {
+            target[key] = value
+        }
+    }
+}
+
+function isPlainObject(value) {
+    return value !== null && typeof value === 'object' && !Array.isArray(value)
+}
+
+class AgentIdGenerator {
+    handle(config) {
+        if (config.agentId?.length > 0) {
+            return {}
+        }
+
+        return { agentId: randomBytes(8).toString('hex') }
+    }
+}
+
+class ApplicationNameValidator {
+    handle(config) {
+        if (config.applicationName?.length > 1) {
+            return {}
+        }
+        return { enable: false }
+    }
+}
+
 function makeEnvironmentConfig() {
     return {
         agentId: valueOfString('PINPOINT_AGENT_ID'),
@@ -95,7 +153,8 @@ function makeEnvironmentConfig() {
             traceExclusionUrl: makeTraceExclusionUrlEnvironmentConfig(),
             sqlStats: valueOfBoolean('PINPOINT_PROFILER_SQL_STAT')
         },
-        plugins: new PluginsEnvironmentConfigBuilder().build()
+        plugins: makePluginsEnvironmentConfig(),
+        enable: valueOfBoolean('PINPOINT_ENABLE')
     }
 }
 
@@ -135,7 +194,7 @@ function makeSamplingEnvironmentConfig() {
 }
 
 function makeLogLevelsEnvironmentConfig() {
-    const value = process.env[envName]
+    const value = process.env['PINPOINT_LOGGER_LEVELS']
     if (typeof value !== 'string' || value.trim().length === 0) {
         return undefined
     }

test/config.test.js

@@ -8,6 +8,7 @@ const test = require('tape')
 const { clear, getConfig, readConfigJson, readRootConfigFile, getMainModulePath } = require('../lib/config')
 const { HttpStatusCodeErrorsBuilder, getHttpStatusCodeErrors, clearHttpStatusCodeErrors } = require('../lib/instrumentation/http/http-status-code-errors-builder')
 const log = require('../lib/utils/log/logger')
+const { ConfigBuilder } = require('../lib/config-builder')
 
 test('Agent ID required field', function (t) {
   t.plan(1)
@@ -16,8 +17,7 @@ test('Agent ID required field', function (t) {
   delete process.env.PINPOINT_AGENT_ID
   delete process.env.PINPOINT_APPLICATION_NAME
 
-  const conf = getConfig()
-
+  const conf = new ConfigBuilder().build()
   t.true(conf.agentId.length == 16)
 })