You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by tm...@apache.org on 2021/06/22 15:09:07 UTC
[sling-org-apache-sling-distribution-journal] 01/01: SLING-10529 -
Remove MDC constructs
This is an automated email from the ASF dual-hosted git repository.
tmaret pushed a commit to branch SLING-10529
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 016ac84fbe3ab28a9de1fb219e378128f73686c4
Author: tmaret <tm...@adobe.com>
AuthorDate: Tue Jun 22 17:08:40 2021 +0200
SLING-10529 - Remove MDC constructs
---
.../journal/bookkeeper/BookKeeper.java | 28 ++++------------------
src/test/resources/logback.xml | 4 ++--
2 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
index b46d792..96f0d45 100644
--- a/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
+++ b/src/main/java/org/apache/sling/distribution/journal/bookkeeper/BookKeeper.java
@@ -56,7 +56,6 @@ import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
/**
* Keeps track of offset and processed status and manages
@@ -150,7 +149,6 @@ public class BookKeeper implements Closeable {
*/
public void importPackage(PackageMessage pkgMsg, long offset, long createdTime) throws DistributionException {
log.info("Importing distribution package {} at offset={}", pkgMsg, offset);
- addPackageMDC(pkgMsg);
try (Timer.Context context = distributionMetricsService.getImportedPackageDuration().time();
ResourceResolver importerResolver = getServiceResolver(SUBSERVICE_IMPORTER)) {
packageHandler.apply(importerResolver, pkgMsg);
@@ -171,43 +169,27 @@ public class BookKeeper implements Closeable {
eventAdmin.postEvent(event);
} catch (DistributionException | LoginException | IOException | RuntimeException | ImportPostProcessException e) {
failure(pkgMsg, offset, e);
- } finally {
- MDC.clear();
}
}
private void postProcess(PackageMessage pkgMsg) throws ImportPostProcessException {
log.debug("Executing import post processor for package [{}]", pkgMsg);
-
+
Map<String, Object> props = new HashMap<>();
props.put(DISTRIBUTION_TYPE, pkgMsg.getReqType().name());
- props.put(DISTRIBUTION_PATHS, pkgMsg.getPaths());
+ props.put(DISTRIBUTION_PATHS, pkgMsg.getPaths());
props.put(DISTRIBUTION_PACKAGE_ID, pkgMsg.getPkgId());
-
+
long postProcessStartTime = currentTimeMillis();
distributionMetricsService.getImportPostProcessRequest().increment();
importPostProcessor.process(props);
-
+
log.debug("Executed import post processor for package [{}]", pkgMsg.getPkgId());
-
+
distributionMetricsService.getImportPostProcessDuration().update((currentTimeMillis() - postProcessStartTime), TimeUnit.MILLISECONDS);
distributionMetricsService.getImportPostProcessSuccess().increment();
}
- private void addPackageMDC(PackageMessage pkgMsg) {
- MDC.put("module", "distribution");
- MDC.put("package-id", pkgMsg.getPkgId());
- String paths = String.join(",", pkgMsg.getPaths());
- MDC.put("paths", paths);
- MDC.put("pub-sling-id", pkgMsg.getPubSlingId());
- String pubAgentName = pkgMsg.getPubAgentName();
- MDC.put("pub-agent-name", pubAgentName);
- MDC.put("distribution-message-type", pkgMsg.getReqType().name());
- MDC.put("retries", Integer.toString(packageRetries.get(pubAgentName)));
- MDC.put("sub-sling-id", config.getSubSlingId());
- MDC.put("sub-agent-name", config.getSubAgentName());
- }
-
/**
* Should be called on a exception while importing a package.
*
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
index 3ad60ba..5690d16 100644
--- a/src/test/resources/logback.xml
+++ b/src/test/resources/logback.xml
@@ -20,7 +20,7 @@
<configuration>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
- <pattern>%date %level [%thread] %logger{10} [%file : %line] %msg - %mdc %n</pattern>
+ <pattern>%date %level [%thread] %logger{10} [%file : %line] %msg - %n</pattern>
</encoder>
</appender>
@@ -28,7 +28,7 @@
<file>target/test.log</file>
<append>true</append>
<encoder>
- <pattern>%date level=%level thread=%thread logger=%logger sourcefile=%file line=%line %mdc message=%msg%n</pattern>
+ <pattern>%date level=%level thread=%thread logger=%logger sourcefile=%file line=%line message=%msg%n</pattern>
</encoder>
</appender>