add liquibaseHostName MDC key (DAT-14956) (liquibase#4370)

mkarg · Jul 6, 2023 · fc64f90 · fc64f90
1 parent fbe608c
commit fc64f90
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java b/liquibase-cli/src/main/java/liquibase/integration/commandline/LiquibaseCommandLine.java
@@ -422,9 +422,12 @@ public int execute(String[] args) {
      */
     private void logMdcData() throws IOException {
         MdcManager mdcManager = Scope.getCurrentScope().getMdcManager();
+        String localHostName = NetUtil.getLocalHostName();
         try (MdcObject version = mdcManager.put(MdcKey.LIQUIBASE_VERSION, LiquibaseUtil.getBuildVersion());
              MdcObject systemUser = mdcManager.put(MdcKey.LIQUIBASE_SYSTEM_USER, System.getProperty("user.name"));
-             MdcObject systemName = mdcManager.put(MdcKey.LIQUIBASE_SYSTEM_NAME, NetUtil.getLocalHostName())) {
+             MdcObject systemName = mdcManager.put(MdcKey.LIQUIBASE_SYSTEM_NAME, localHostName);
+             // The host name here is purposefully the same as the system name. The system name is retained for backwards compatibility.
+             MdcObject hostName = mdcManager.put(MdcKey.LIQUIBASE_HOST_NAME, localHostName)) {
             Scope.getCurrentScope().getLog(getClass()).info("Starting command execution.");
         }
     }

diff --git a/liquibase-standard/src/main/java/liquibase/logging/mdc/MdcKey.java b/liquibase-standard/src/main/java/liquibase/logging/mdc/MdcKey.java
@@ -19,7 +19,12 @@ public class MdcKey {
     public static final String DEPLOYMENT_OUTCOME = "deploymentOutcome";
     public static final String LIQUIBASE_COMMAND_NAME = "liquibaseCommandName";
     public static final String LIQUIBASE_VERSION = "liquibaseVersion";
+    /**
+     * Use the {@link MdcKey}#LIQUIBASE_HOST_NAME instead.
+     */
+    @Deprecated
     public static final String LIQUIBASE_SYSTEM_NAME = "liquibaseSystemName";
+    public static final String LIQUIBASE_HOST_NAME = "liquibaseHostName";
     public static final String LIQUIBASE_SYSTEM_USER = "liquibaseSystemUser";
     public static final String OUTPUT_FILE = "outputFile";
     public static final String OUTPUT_FILE_ENCODING = "outputFileEncoding";