diff --git a/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala b/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala index 04990ddc4c9d7..2ca80a496ccb9 100644 --- a/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala +++ b/common/utils/src/main/scala/org/apache/spark/internal/LogKey.scala @@ -16,10 +16,14 @@ */ package org.apache.spark.internal +import java.util.Locale + /** * All structured logging `keys` used in `MDC` must be extends `LogKey` */ -trait LogKey +trait LogKey { + val name: String = this.toString.toLowerCase(Locale.ROOT) +} /** * Various keys used for mapped diagnostic contexts(MDC) in logging. diff --git a/common/utils/src/main/scala/org/apache/spark/internal/Logging.scala b/common/utils/src/main/scala/org/apache/spark/internal/Logging.scala index 085b22bee5f36..24a60f88c24ac 100644 --- a/common/utils/src/main/scala/org/apache/spark/internal/Logging.scala +++ b/common/utils/src/main/scala/org/apache/spark/internal/Logging.scala @@ -17,8 +17,6 @@ package org.apache.spark.internal -import java.util.Locale - import scala.jdk.CollectionConverters._ import org.apache.logging.log4j.{CloseableThreadContext, Level, LogManager} @@ -110,7 +108,7 @@ trait Logging { val value = if (mdc.value != null) mdc.value.toString else null sb.append(value) if (Logging.isStructuredLoggingEnabled) { - context.put(mdc.key.toString.toLowerCase(Locale.ROOT), value) + context.put(mdc.key.name, value) } if (processedParts.hasNext) {