Skip to content
Closed
Changes from 1 commit
Commits
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
Remove redundant mdc keys and rename to match josdk mdc pattern
  • Loading branch information
jiangzho committed Apr 17, 2024
commit 4bf6d5961fea1a5d5fe305aaf80a81807af1015b
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,26 @@
import java.util.Set;
import java.util.concurrent.locks.ReentrantLock;

import org.apache.commons.lang3.StringUtils;
import org.slf4j.MDC;

import org.apache.spark.kubernetes.operator.SparkApplication;
import org.apache.spark.kubernetes.operator.status.ApplicationAttemptSummary;

public class LoggingUtils {
public static final class TrackedMDC {
public static final String NamespaceKey = "app_namespace";
public static final String NameKey = "app_name";
public static final String UuidKey = "app_uuid";
public static final String GenerationKey = "app_generation";
public static final String AppAttemptIdKey = "resource.app.attemptId";
private final ReentrantLock lock = new ReentrantLock();
private Set<String> keys = new HashSet<>();

public void set(final SparkApplication application) {
if (application != null && application.getMetadata() != null) {
if (application != null && application.getStatus() != null) {
try {
lock.lock();
if (StringUtils.isNotEmpty(application.getMetadata().getNamespace())) {
MDC.put(NamespaceKey, application.getMetadata().getNamespace());
keys.add(NamespaceKey);
ApplicationAttemptSummary summary = application.getStatus().getCurrentAttemptSummary();
if (summary != null && summary.getAttemptInfo() != null) {
MDC.put(AppAttemptIdKey, summary.getAttemptInfo().getId().toString());
keys.add(AppAttemptIdKey);
}
if (StringUtils.isNotEmpty(application.getMetadata().getName())) {
MDC.put(NameKey, application.getMetadata().getName());
keys.add(NameKey);
}
if (StringUtils.isNotEmpty(application.getMetadata().getUid())) {
MDC.put(UuidKey, application.getMetadata().getUid());
keys.add(UuidKey);
}
MDC.put(GenerationKey,
String.valueOf(application.getMetadata().getGeneration()));
keys.add(GenerationKey);
} finally {
lock.unlock();
}
Expand Down