Merge pull request #1096 from oracle/pmackin-OWLS-72195

pmackin-OWLS-72195

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/logging/LoggingFormatter.java

@@ -19,7 +19,9 @@
 import java.util.Map;
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
+import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
 import oracle.kubernetes.operator.work.Fiber;
+import oracle.kubernetes.operator.work.Packet;
 
 /** Custom log formatter to format log messages in JSON format. */
 public class LoggingFormatter extends Formatter {
@@ -29,6 +31,7 @@ public class LoggingFormatter extends Formatter {
   private static final String TIMESTAMP = "timestamp";
   private static final String THREAD = "thread";
   private static final String FIBER = "fiber";
+  private static final String DOMAIN_UID = "domainUID";
   private static final String SOURCE_CLASS = "class";
   private static final String SOURCE_METHOD = "method";
   private static final String TIME_IN_MILLIS = "timeInMillis";
@@ -109,6 +112,7 @@ public String format(LogRecord record) {
     map.put(TIMESTAMP, dateString);
     map.put(THREAD, thread);
     map.put(FIBER, fiber != null ? fiber.toString() : "");
+    map.put(DOMAIN_UID, getDomainUID(fiber));
     map.put(LOG_LEVEL, level);
     map.put(SOURCE_CLASS, sourceClassName);
     map.put(SOURCE_METHOD, sourceMethodName);
@@ -138,4 +142,21 @@ public String format(LogRecord record) {
     }
     return json + "\n";
   }
+
+  /**
+   * Get the domain UID currently being used by the step executing for the Fiber.
+   *
+   * @param fiber The current Fiber
+   * @return the domain UID or empty string
+   */
+  private String getDomainUID(Fiber fiber) {
+
+    Packet packet = fiber == null ? null : fiber.getPacket();
+    if (packet != null) {
+      DomainPresenceInfo info = packet.getSPI(DomainPresenceInfo.class);
+      return info == null ? "" : info.getDomainUID();
+    } else {
+      return "";
+    }
+  }
 }