Skip to content

[SPARK-48623][CORE] Structured Logging Migrations #46980

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
asl3 wants to merge 19 commits into from
Closed

[SPARK-48623][CORE] Structured Logging Migrations #46980

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8f747e3
[DRAFT] Scala Structured Logging Migration
asl3 Jun 13, 2024
b570a01
add LogKeys imports
asl3 Jun 13, 2024
280b220
update new logkey names
asl3 Jun 14, 2024
6a570d3
add mdc imports
asl3 Jun 14, 2024
b65d9a6
modify logkey names
asl3 Jun 17, 2024
9f06627
add TARGET_NUM_EXECUTOR log key
asl3 Jun 17, 2024
fd4a60d
Merge branch 'master' into logging-migrationscala
asl3 Jun 17, 2024
9c368dd
add sink log key
asl3 Jun 17, 2024
85049f3
update log key names
asl3 Jun 17, 2024
e94f280
rename logkeys
asl3 Jun 17, 2024
945d0be
keep OPERATION_HANDLE_IDENTIFIER
asl3 Jun 17, 2024
3c646f0
lint fix
asl3 Jun 17, 2024
6e9d443
scala format
asl3 Jun 18, 2024
d1c2676
lint fix
asl3 Jun 18, 2024
f2a79b8
scala format
asl3 Jun 18, 2024
ebe7bec
lint
asl3 Jun 18, 2024
dd510b3
add logkeys imports
asl3 Jun 18, 2024
12e0680
revert SparkSQLCLI SparkLogger use
asl3 Jun 18, 2024
b5e8709
sort log keys
asl3 Jun 19, 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
Prev Previous commit
Next Next commit
lint
  • Loading branch information
@asl3
asl3 committed Jun 18, 2024
commit ebe7bec442b17dbe460bfc088545a73a014515c6
13 changes: 8 additions & 5 deletions ...cala/org/apache/spark/sql/connect/planner/SparkConnectStreamingQueryListenerHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ class SparkConnectStreamingQueryListenerHandler(executeHolder: ExecuteHolder) ex
logError(
log"[SessionId: ${MDC(LogKeys.SESSION_ID, sessionId)}]" +
log"[UserId: ${MDC(LogKeys.USER_ID, userId)}]" +
log"[operationId: ${MDC(LogKeys.OPERATION_HANDLE_IDENTIFIER, executeHolder.operationId)}] " +
log"[operationId: " +
log"${MDC(LogKeys.OPERATION_HANDLE_IDENTIFIER, executeHolder.operationId)}] " +
log"Error sending listener added response.",
e)
listenerHolder.cleanUp()
Expand All @@ -100,10 +101,12 @@ class SparkConnectStreamingQueryListenerHandler(executeHolder: ExecuteHolder) ex
log"removed or there is error transmitting the event back.")
// Block the handling thread, and have serverListener continuously send back new events
listenerHolder.streamingQueryListenerLatch.await()
logInfo(log"[SessionId: ${MDC(LogKeys.SESSION_ID, sessionId)}][UserId: " +
log"${MDC(LogKeys.USER_ID, userId)}]" +
log"[operationId: ${MDC(LogKeys.OPERATION_HANDLE_IDENTIFIER, executeHolder.operationId)}] " +
log"Server side listener long-running handling thread ended.")
logInfo(
log"[SessionId: ${MDC(LogKeys.SESSION_ID, sessionId)}][UserId: " +
log"${MDC(LogKeys.USER_ID, userId)}]" +
log"[operationId: " +
log"${MDC(LogKeys.OPERATION_HANDLE_IDENTIFIER, executeHolder.operationId)}] " +
log"Server side listener long-running handling thread ended.")
case StreamingQueryListenerBusCommand.CommandCase.REMOVE_LISTENER_BUS_LISTENER =>
listenerHolder.isServerSideListenerRegistered match {
case true =>
Expand Down