add to context inside util function

Author: lcian

sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java

@@ -320,10 +320,6 @@ SentryEvent createEvent(final @NotNull LogRecord record) {
         // initialized somewhere else
         final List<String> contextTags = ScopesAdapter.getInstance().getOptions().getContextTags();
         LoggerPropertiesUtil.applyPropertiesToEvent(event, contextTags, mdcProperties);
-        // put the rest of mdc tags in contexts
-        if (!mdcProperties.isEmpty()) {
-          event.getContexts().put("MDC", mdcProperties);
-        }
       }
     }
     event.setExtra(THREAD_ID, record.getThreadID());

sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java

@@ -286,10 +286,6 @@ protected void captureLog(@NotNull LogEvent loggingEvent) {
       // initialized somewhere else
       final List<String> contextTags = scopes.getOptions().getContextTags();
       LoggerPropertiesUtil.applyPropertiesToEvent(event, contextTags, contextData);
-      // put the rest of mdc tags in contexts
-      if (!contextData.isEmpty()) {
-        event.getContexts().put("Context Data", contextData);
-      }
     }
 
     return event;

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

@@ -154,10 +154,6 @@ protected void append(@NotNull ILoggingEvent eventObject) {
       // initialized somewhere else
       final List<String> contextTags = ScopesAdapter.getInstance().getOptions().getContextTags();
       LoggerPropertiesUtil.applyPropertiesToEvent(event, contextTags, mdcProperties);
-      // put the rest of mdc tags in contexts
-      if (!mdcProperties.isEmpty()) {
-        event.getContexts().put("MDC", mdcProperties);
-      }
     }
 
     return event;

sentry/src/main/java/io/sentry/util/LoggerPropertiesUtil.java

@@ -14,8 +14,9 @@
 public final class LoggerPropertiesUtil {
 
   /**
-   * Applies logger properties from a map to a Sentry event as tags. Only the properties with keys
-   * that are found in `targetKeys` will be applied as tags.
+   * Applies logger properties from a map to a Sentry event as tags and context. The properties that
+   * have keys matching any of the `targetKeys` will be applied as tags, while the others will be
+   * reported in the `MDC` context.
    *
    * @param event the Sentry event to add tags to
    * @param targetKeys the list of property keys to apply as tags
@@ -34,6 +35,9 @@ public static void applyPropertiesToEvent(
           properties.remove(key);
         }
       }
+      if (!properties.isEmpty()) {
+        event.getContexts().put("MDC", properties);
+      }
     }
   }