JPERF-838: Add Log4j2SplunkForwarder SplunkForwarder decorator to handle log4j2 config files.

Author: filip-nowak-atl

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/jira/JiraNodeConfig.kt

@@ -9,6 +9,7 @@ import com.atlassian.performance.tools.infrastructure.api.jvm.jmx.DisabledRemote
 import com.atlassian.performance.tools.infrastructure.api.jvm.jmx.RemoteJmx
 import com.atlassian.performance.tools.infrastructure.api.profiler.Profiler
 import com.atlassian.performance.tools.infrastructure.api.splunk.DisabledSplunkForwarder
+import com.atlassian.performance.tools.infrastructure.api.splunk.Log4j2SplunkForwarder
 import com.atlassian.performance.tools.infrastructure.api.splunk.SplunkForwarder
 import com.atlassian.performance.tools.infrastructure.profiler.DisabledProfiler
 import java.net.URI
@@ -40,7 +41,7 @@ class JiraNodeConfig private constructor(
         remoteJmx = remoteJmx,
         jvmArgs = jvmArgs,
         collectdConfigs = collectdConfigs,
-        splunkForwarder = splunkForwarder,
+        splunkForwarder = Log4j2SplunkForwarder("log4j2.xml", splunkForwarder),
         launchTimeouts = launchTimeouts,
         jdk = OracleJDK(),
         profiler = DisabledProfiler()
@@ -77,7 +78,7 @@ class JiraNodeConfig private constructor(
         remoteJmx = remoteJmx,
         jvmArgs = jvmArgs,
         collectdConfigs = DEFAULT_COLLECTD_CONFIGS,
-        splunkForwarder = splunkForwarder,
+        splunkForwarder = Log4j2SplunkForwarder("log4j2.xml", splunkForwarder),
         launchTimeouts = launchTimeouts,
         jdk = OracleJDK(),
         profiler = DisabledProfiler()
@@ -143,7 +144,7 @@ class JiraNodeConfig private constructor(
             debug = debug,
             remoteJmx = remoteJmx,
             jvmArgs = jvmArgs,
-            splunkForwarder = splunkForwarder,
+            splunkForwarder = Log4j2SplunkForwarder("log4j2.xml", splunkForwarder),
             collectdConfigs = collectdConfigs,
             launchTimeouts = launchTimeouts,
             jdk = if (versionedJdk != null) versionedJdk as JavaDevelopmentKit else jdk,
@@ -157,4 +158,4 @@ class JiraNodeConfig private constructor(
             JiraNodeConfig::class.java.getResource("/collectd/conf/jira-default.conf").toURI()
         )
     }
-}
+}

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/splunk/Log4j2SplunkForwarder.kt

@@ -0,0 +1,16 @@
+package com.atlassian.performance.tools.infrastructure.api.splunk
+
+import com.atlassian.performance.tools.infrastructure.splunk.Log4jJsonifier
+import com.atlassian.performance.tools.ssh.api.SshConnection
+import java.nio.file.Paths
+
+class Log4j2SplunkForwarder(log4j2ConfigFileName: String, splunkForwarder: SplunkForwarder) :
+    SplunkForwarder by splunkForwarder {
+
+    private val log4jConfigFileName = log4j2ConfigFileName
+
+    override fun jsonifyLog4j(sshConnection: SshConnection, log4jPropertiesPath: String) {
+        val log4j2ConfigPath = Paths.get(log4jPropertiesPath).resolveSibling(log4jConfigFileName).toString()
+        Log4jJsonifier().jsonifyLog4j1AndLog4j2(sshConnection, log4jPropertiesPath, log4j2ConfigPath)
+    }
+}

src/main/kotlin/com/atlassian/performance/tools/infrastructure/api/splunk/SplunkForwarder.kt

@@ -1,15 +1,9 @@
 package com.atlassian.performance.tools.infrastructure.api.splunk
 
-import com.atlassian.performance.tools.infrastructure.splunk.Log4jJsonifier
 import com.atlassian.performance.tools.ssh.api.SshConnection
 
 interface SplunkForwarder {
     fun run(sshConnection: SshConnection, name: String, logsPath: String)
     fun jsonifyLog4j(sshConnection: SshConnection, log4jPropertiesPath: String)
     fun getRequiredPorts(): List<Int>
 }
-
-// Extension method to avoid breaking changes
-fun SplunkForwarder.jsonifyLog4j1AndLog4j2(sshConnection: SshConnection, log4jPropertiesPath: String, log4j2ConfigPath: String) {
-    Log4jJsonifier().jsonifyLog4j1AndLog4j2(sshConnection, log4jPropertiesPath, log4j2ConfigPath)
-}