Skip to content

Commit deb9de9

Browse files
authored
chore(deps): bump logback to 1.3.13 (#194)
1 parent 10df464 commit deb9de9

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>ch.qos.logback</groupId>
7272
<artifactId>logback-classic</artifactId>
73-
<version>1.3.7</version>
73+
<version>1.3.13</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.github.spotbugs</groupId>

src/main/java/com/aws/greengrass/logging/impl/config/LogConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1313
import lombok.Getter;
1414
import org.slf4j.event.Level;
15+
import org.slf4j.impl.StaticMDCBinder;
1516

1617
import java.nio.file.Paths;
1718
import java.util.Optional;
@@ -37,6 +38,8 @@ public static LogConfig getRootLogConfig() {
3738
@SuppressFBWarnings("MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR")
3839
protected LogConfig() {
3940
super(LOG_FILE_EXTENSION, LOGS_DIRECTORY);
41+
// Must set an MDC adapter for 1.3.8+. https://github.com/qos-ch/logback/issues/709
42+
context.setMDCAdapter(StaticMDCBinder.SINGLETON.getMDCA());
4043
reconfigure(context.getLogger(Logger.ROOT_LOGGER_NAME));
4144
startContext();
4245
}

src/main/java/com/aws/greengrass/telemetry/impl/config/TelemetryConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import lombok.Getter;
1818
import lombok.Setter;
1919
import org.slf4j.event.Level;
20+
import org.slf4j.impl.StaticMDCBinder;
2021

2122
import java.nio.file.Path;
2223
import java.nio.file.Paths;
@@ -47,6 +48,8 @@ public class TelemetryConfig extends PersistenceConfig {
4748
@SuppressFBWarnings("MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR")
4849
private TelemetryConfig() {
4950
super(CONFIG_PREFIX);
51+
// Must set an MDC adapter for 1.3.8+. https://github.com/qos-ch/logback/issues/709
52+
context.setMDCAdapter(StaticMDCBinder.SINGLETON.getMDCA());
5053
boolean metricsEnabled = DEFAULT_METRICS_SWITCH;
5154
String enabledStr = System.getProperty(METRICS_SWITCH_KEY);
5255
if (enabledStr != null) {

0 commit comments

Comments
 (0)