Skip to content

[SPARK-48490][CORE][FOLLOWUP] Properly process escape sequences #47050

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gengliangwang wants to merge 2 commits into from
Closed

[SPARK-48490][CORE][FOLLOWUP] Properly process escape sequences #47050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82699f6
fix
gengliangwang Jun 21, 2024
80537e2
fix
gengliangwang Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions common/utils/src/main/scala/org/apache/spark/internal/Logging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.apache.spark.internal

import scala.jdk.CollectionConverters._

import org.apache.commons.text.StringEscapeUtils
import org.apache.logging.log4j.{CloseableThreadContext, Level, LogManager}
import org.apache.logging.log4j.core.{Filter, LifeCycle, LogEvent, Logger => Log4jLogger, LoggerContext}
import org.apache.logging.log4j.core.appender.ConsoleAppender
Expand Down Expand Up @@ -100,7 +99,7 @@ case class MessageWithContext(message: String, context: java.util.HashMap[String
* Companion class for lazy evaluation of the MessageWithContext instance.
*/
class LogEntry(messageWithContext: => MessageWithContext) {
def message: String = StringEscapeUtils.unescapeJava(messageWithContext.message)
def message: String = messageWithContext.message

def context: java.util.HashMap[String, String] = messageWithContext.context
}
Expand Down Expand Up @@ -144,7 +143,7 @@ trait Logging {
implicit class LogStringContext(val sc: StringContext) {
def log(args: MDC*): MessageWithContext = {
val processedParts = sc.parts.iterator
val sb = new StringBuilder(processedParts.next())
val sb = new StringBuilder(StringContext.processEscapes(processedParts.next()))
val context = new java.util.HashMap[String, String]()

args.foreach { mdc =>
Expand All @@ -155,7 +154,7 @@ trait Logging {
}

if (processedParts.hasNext) {
sb.append(processedParts.next())
sb.append(StringContext.processEscapes(processedParts.next()))
}
}

Expand Down
9 changes: 9 additions & 0 deletions common/utils/src/test/scala/org/apache/spark/util/StructuredLoggingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,15 @@ class StructuredLoggingSuite extends LoggingSuiteBase {
}""")
assert(pattern1.r.matches(logOutput) || pattern2.r.matches(logOutput))
}

test("process escape sequences") {
assert(log"\n".message == "\n")
assert(log"\t".message == "\t")
assert(log"\b".message == "\b")
assert(log"\r".message == "\r")
assert((log"\r" + log"\n" + log"\t" + log"\b").message == "\r\n\t\b")
assert((log"\r${MDC(LogKeys.EXECUTOR_ID, 1)}\n".message == "\r1\n"))
}
}

object CustomLogKeys {
Expand Down