This is an automated email from the ASF dual-hosted git repository.
afedulov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 34924affa9c [FLINK-36227] Restore compatibility with Logback 1.2
34924affa9c is described below
commit 34924affa9c09722759baadb245e5231a9840b4a
Author: Piotr Przybylski <piotr...@gmail.com>
AuthorDate: Wed Jan 8 23:54:19 2025 +0100
[FLINK-36227] Restore compatibility with Logback 1.2
---
.../main/java/org/apache/flink/util/MdcUtils.java | 8 ++-
.../flink/util/MdcLogbackCompatibilityTest.java | 80 ++++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/flink-core/src/main/java/org/apache/flink/util/MdcUtils.java
b/flink-core/src/main/java/org/apache/flink/util/MdcUtils.java
index c448c9837db..b076c64c783 100644
--- a/flink-core/src/main/java/org/apache/flink/util/MdcUtils.java
+++ b/flink-core/src/main/java/org/apache/flink/util/MdcUtils.java
@@ -45,7 +45,13 @@ public class MdcUtils {
public static MdcCloseable withContext(Map<String, String> context) {
final Map<String, String> orig = MDC.getCopyOfContextMap();
MDC.setContextMap(context);
- return () -> MDC.setContextMap(orig);
+ return () -> {
+ if (orig != null) {
+ MDC.setContextMap(orig);
+ } else {
+ MDC.clear();
+ }
+ };
}
/** {@link AutoCloseable } that restores the {@link MDC} contents on
close. */
diff --git
a/flink-core/src/test/java/org/apache/flink/util/MdcLogbackCompatibilityTest.java
b/flink-core/src/test/java/org/apache/flink/util/MdcLogbackCompatibilityTest.java
new file mode 100644
index 00000000000..5cef5564551
--- /dev/null
+++
b/flink-core/src/test/java/org/apache/flink/util/MdcLogbackCompatibilityTest.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.util;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
+import org.slf4j.MDC;
+import org.slf4j.helpers.BasicMDCAdapter;
+import org.slf4j.spi.MDCAdapter;
+
+import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
+@Isolated
+public class MdcLogbackCompatibilityTest {
+
+ private MDCAdapter originalAdapter;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ originalAdapter = getCurrentMDCAdapter();
+ setMDCAdapter(new BasicMDCAdapter());
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ setMDCAdapter(originalAdapter);
+ }
+
+ /**
+ * The {@link MDC#setContextMap(Map)} method in Logback 1.2 does not
accept nulls, unlike Log4j
+ * and Logback 1.3.2. BasicMDCAdapter is used to replicate this behavior
for testing without
+ * bundling Logback into flink-core. See
https://issues.apache.org/jira/browse/FLINK-36227 for
+ * details.
+ */
+ @Test
+ void testContextRestorationWorksWithNullContext() {
+ assertThat(MDC.getCopyOfContextMap()).isNull();
+
+ MdcUtils.MdcCloseable restoreContext =
+ MdcUtils.withContext(Collections.singletonMap("k", "v"));
+ assertThat(MDC.get("k")).isEqualTo("v");
+ assertDoesNotThrow(restoreContext::close);
+ assertThat(MDC.get("k")).isNull();
+ }
+
+ private MDCAdapter getCurrentMDCAdapter() throws Exception {
+ Field adapterField = MDC.class.getDeclaredField("mdcAdapter");
+ adapterField.setAccessible(true);
+ return (MDCAdapter) adapterField.get(null);
+ }
+
+ private void setMDCAdapter(MDCAdapter adapter) throws Exception {
+ Field adapterField = MDC.class.getDeclaredField("mdcAdapter");
+ adapterField.setAccessible(true);
+ adapterField.set(null, adapter);
+ }
+}
