panbingkun commented on code in PR #45784:
URL: https://github.com/apache/spark/pull/45784#discussion_r1545536369
##########
common/utils/src/test/scala/org/apache/spark/util/StructuredLoggingSuite.scala:
##########
@@ -94,19 +98,58 @@ abstract class LoggingSuiteBase extends AnyFunSuite //
scalastyle:ignore funsuit
}
class StructuredLoggingSuite extends LoggingSuiteBase {
- private val className = this.getClass.getName.stripSuffix("$")
+ override def className: String = classOf[StructuredLoggingSuite].getName
override def logFilePath: String = "target/structured.log"
- override def expectedPatternForBasicMsg(level: String): String =
- s"""\\{"ts":"[^"]+","level":"$level","msg":"This is a log
message","logger":"$className"}\n"""
+ private val jsonMapper = new
ObjectMapper().registerModule(DefaultScalaModule)
+ private def compactAndToRegexPattern(json: String): String = {
+ jsonMapper.readTree(json).toString.
+ replace("<timestamp>", """[^"]+""").
+ replace(""""<stacktrace>"""", """.*""").
+ replace("{", """\{""") + "\n"
+ }
- override def expectedPatternForMsgWithMDC(level: String): String =
- // scalastyle:off line.size.limit
- s"""\\{"ts":"[^"]+","level":"$level","msg":"Lost executor
1.","context":\\{"executor_id":"1"},"logger":"$className"}\n"""
- // scalastyle:on
+ override def expectedPatternForBasicMsg(level: Level): String = {
+ compactAndToRegexPattern(
+ s"""
+ {
+ "ts": "<timestamp>",
+ "level": "$level",
+ "msg": "This is a log message",
+ "logger": "$className"
+ }""")
+ }
- override def expectedPatternForMsgWithMDCAndException(level: String): String
=
- // scalastyle:off line.size.limit
- s"""\\{"ts":"[^"]+","level":"$level","msg":"Error in executor
1.","context":\\{"executor_id":"1"},"exception":\\{"class":"java.lang.RuntimeException","msg":"OOM","stacktrace":.*},"logger":"$className"}\n"""
- // scalastyle:on
+ override def expectedPatternForMsgWithMDC(level: Level): String = {
+ compactAndToRegexPattern(
+ s"""
+ {
+ "ts": "<timestamp>",
+ "level": "$level",
+ "msg": "Lost executor 1.",
+ "context": {
+ "executor_id": "1"
+ },
+ "logger": "$className"
+ }""")
+ }
+
+ override def expectedPatternForMsgWithMDCAndException(level: Level): String
= {
+ compactAndToRegexPattern(
Review Comment:
This line is `too long`,
Show it in `pretty json` to developers,
This can also eliminate the comment `scalastyle:off line.size.limit`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
