[#404] Configuration Reconstructing

Author: feelform

lib/config-builder.js

@@ -43,6 +43,7 @@ class ConfigBuilder {
         const config = Object.assign({},
             this.defaultJson,
             this.userDefinedJson,
+            makeEnvironmentConfig(),
             this.agentStartupUserDefinedJson
         )
         return new Config(config)
@@ -80,66 +81,99 @@ class ConfigBuilder {
     }
 }
 
-class EnvironmentConfig {
-    constructor() {
-        this.env = {
-            agentId: valueOfString('PINPOINT_AGENT_ID'),
-            agentName: valueOfString('PINPOINT_AGENT_NAME'),
-            applicationName: valueOfString('PINPOINT_APPLICATION_NAME'),
-            applicationServiceType: valueOfNumber('PINPOINT_SERVICE_TYPE'),
-            collector: new CollectorEnvironmentConfig(),
-            sampling: new SamplingEnvironmentConfig(),
-            features: {
-                container: valueOfBoolean('PINPOINT_CONTAINER'),
-                logLevels: new LogLevelsEnvironmentConfig(),
-                traceExclusionUrl: new TraceExclusionUrlEnvironmentConfig(),
-                sqlStats: valueOfBoolean('PINPOINT_PROFILER_SQL_STAT')
-            },
-            plugins: new PluginsEnvironmentConfig()
-        }
+function makeEnvironmentConfig() {
+    return {
+        agentId: valueOfString('PINPOINT_AGENT_ID'),
+        agentName: valueOfString('PINPOINT_AGENT_NAME'),
+        applicationName: valueOfString('PINPOINT_APPLICATION_NAME'),
+        applicationServiceType: valueOfNumber('PINPOINT_SERVICE_TYPE'),
+        collector: makeCollectorEnvironmentConfig(),
+        sampling: makeSamplingEnvironmentConfig(),
+        features: {
+            container: valueOfBoolean('PINPOINT_CONTAINER'),
+            logLevels: makeLogLevelsEnvironmentConfig(),
+            traceExclusionUrl: makeTraceExclusionUrlEnvironmentConfig(),
+            sqlStats: valueOfBoolean('PINPOINT_PROFILER_SQL_STAT')
+        },
+        plugins: new PluginsEnvironmentConfigBuilder().build()
     }
 }
 
-class CollectorEnvironmentConfig {
-    constructor() {
-        this.env = {
-            ip: valueOfString('PINPOINT_COLLECTOR_IP'),
-            spanPort: valueOfNumber('PINPOINT_COLLECTOR_SPAN_PORT'),
-            statPort: valueOfNumber('PINPOINT_COLLECTOR_STAT_PORT'),
-            tcpPort: valueOfNumber('PINPOINT_COLLECTOR_TCP_PORT'),
-        }
+function valueOfString(envName) {
+    const value = process.env[envName]
+    return value !== undefined ? value : undefined
+}
+
+function valueOfNumber(envName) {
+    const value = process.env[envName]
+    return value !== undefined ? Number(value) : undefined
+}
+
+function valueOfBoolean(envName) {
+    const value = process.env[envName]
+    return typeof value === 'string' ? value.toLowerCase() === 'true' : undefined
+}
+
+function makeCollectorEnvironmentConfig() {
+    return {
+        ip: valueOfString('PINPOINT_COLLECTOR_IP'),
+        spanPort: valueOfNumber('PINPOINT_COLLECTOR_SPAN_PORT'),
+        statPort: valueOfNumber('PINPOINT_COLLECTOR_STAT_PORT'),
+        tcpPort: valueOfNumber('PINPOINT_COLLECTOR_TCP_PORT'),
     }
 }
 
-class SamplingEnvironmentConfig {
-    constructor() {
-        const samplingEnable = valueOfBoolean('PINPOINT_SAMPLING')
-        if (!samplingEnable) {
-            return
-        }
+function makeSamplingEnvironmentConfig() {
+    const samplingEnable = valueOfBoolean('PINPOINT_SAMPLING')
+    if (!samplingEnable) {
+        return
+    }
 
-        this.env = {
-            rate: valueOfNumber('PINPOINT_SAMPLING_RATE')
-        }
+    return {
+        rate: valueOfNumber('PINPOINT_SAMPLING_RATE')
     }
 }
 
-class LogLevelsEnvironmentConfig {
-    constructor() {
-        this.levels = valueOfLoggerLevels('PINPOINT_LOGGER_LEVELS')
+function makeLogLevelsEnvironmentConfig() {
+    const value = process.env[envName]
+    if (typeof value !== 'string' || value.trim().length === 0) {
+        return undefined
+    }
+
+    const loggerLevels = {}
+    const pairs = value.split(',')
+
+    const validLevels = Object.keys(levels).map(level => level.toUpperCase())
+    for (const pair of pairs) {
+        const trimmedPair = pair.trim()
+        if (trimmedPair.length === 0) continue
+
+        const equalIndex = trimmedPair.indexOf('=')
+        if (equalIndex === -1) continue
+
+        const loggerName = trimmedPair.substring(0, equalIndex).trim()
+        const logLevel = trimmedPair.substring(equalIndex + 1).trim().toUpperCase()
+
+        if (loggerName.length === 0 || logLevel.length === 0) continue
+
+        if (validLevels.includes(logLevel)) {
+            loggerLevels[loggerName] = logLevel
+        }
     }
+
+    return Object.keys(loggerLevels).length > 0 ? loggerLevels : undefined
 }
 
-class TraceExclusionUrlEnvironmentConfig {
-    constructor() {
-        this.patterns = valueOfString('PINPOINT_TRACE_EXCLUSION_URL_PATTERNS')
-        this.cacheSize = valueOfNumber('PINPOINT_TRACE_EXCLUSION_URL_CACHE_SIZE')
+function makeTraceExclusionUrlEnvironmentConfig() {
+    return {
+        patterns: valueOfString('PINPOINT_TRACE_EXCLUSION_URL_PATTERNS'),
+        cacheSize: valueOfNumber('PINPOINT_TRACE_EXCLUSION_URL_CACHE_SIZE')
     }
 }
 
-class PluginsEnvironmentConfig {
-    constructor() {
-        this.httpErrorStatusCodes = valueOfString('PINPOINT_HTTP_STATUS_CODE_ERRORS')
+function makePluginsEnvironmentConfig() {
+    return {
+        httpErrorStatusCodes: valueOfString('PINPOINT_HTTP_STATUS_CODE_ERRORS')
     }
 }