more fixes

Author: lcian

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

@@ -285,7 +285,7 @@ protected void captureLog(@NotNull LogEvent loggingEvent) {
       // get tags from ScopesAdapter options to allow getting the correct tags if Sentry has been
       // initialized somewhere else
       final List<String> contextTags = scopes.getOptions().getContextTags();
-      LoggerPropertiesUtil.applyPropertiesToEvent(event, contextTags, contextData);
+      LoggerPropertiesUtil.applyPropertiesToEvent(event, contextTags, contextData, "Context Data");
     }
 
     return event;

sentry-log4j2/src/test/kotlin/io/sentry/log4j2/SentryAppenderTest.kt

@@ -334,7 +334,9 @@ class SentryAppenderTest {
 
     verify(fixture.transport)
       .send(
-        checkEvent { event -> assertEquals(mapOf("key" to "value"), event.contexts["MDC"]) },
+        checkEvent { event ->
+          assertEquals(mapOf("key" to "value"), event.contexts["Context Data"])
+        },
         anyOrNull(),
       )
   }
@@ -349,7 +351,7 @@ class SentryAppenderTest {
     verify(fixture.transport)
       .send(
         checkEvent { event ->
-          assertEquals(mapOf("key" to "value"), event.contexts["MDC"])
+          assertEquals(mapOf("key" to "value"), event.contexts["Context Data"])
           assertEquals(mapOf("contextTag1" to "contextTag1Value"), event.tags)
         },
         anyOrNull(),
@@ -366,7 +368,7 @@ class SentryAppenderTest {
     verify(fixture.transport)
       .send(
         checkEvent { event ->
-          assertNotNull(event.contexts["MDC"]) {
+          assertNotNull(event.contexts["Context Data"]) {
             val contextData = it as Map<*, *>
             assertNull(contextData["key1"])
             assertEquals("value", contextData["key2"])
@@ -384,7 +386,7 @@ class SentryAppenderTest {
     logger.warn("testing MDC tags")
 
     verify(fixture.transport)
-      .send(checkEvent { event -> assertNull(event.contexts["MDC"]) }, anyOrNull())
+      .send(checkEvent { event -> assertNull(event.contexts["Context Data"]) }, anyOrNull())
   }
 
   @Test
@@ -393,7 +395,10 @@ class SentryAppenderTest {
     logger.warn("testing without MDC tags")
 
     verify(fixture.transport)
-      .send(checkEvent { event -> assertFalse(event.contexts.containsKey("MDC")) }, anyOrNull())
+      .send(
+        checkEvent { event -> assertFalse(event.contexts.containsKey("Context Data")) },
+        anyOrNull(),
+      )
   }
 
   @Test
@@ -593,7 +598,6 @@ class SentryAppenderTest {
   @Test
   fun `sets properties from ThreadContext as attributes on logs`() {
     val logger = fixture.getSut(minimumLevel = Level.INFO, contextTags = listOf("someTag"))
-    ScopesAdapter.getInstance().options.logs.isEnabled = true
 
     ThreadContext.put("someTag", "someValue")
     ThreadContext.put("otherTag", "otherValue")

sentry/api/sentry.api

@@ -7091,6 +7091,7 @@ public final class io/sentry/util/LoggerPropertiesUtil {
 	public fun <init> ()V
 	public static fun applyPropertiesToAttributes (Lio/sentry/SentryAttributes;Ljava/util/List;Ljava/util/Map;)V
 	public static fun applyPropertiesToEvent (Lio/sentry/SentryEvent;Ljava/util/List;Ljava/util/Map;)V
+	public static fun applyPropertiesToEvent (Lio/sentry/SentryEvent;Ljava/util/List;Ljava/util/Map;Ljava/lang/String;)V
 }
 
 public final class io/sentry/util/MapObjectReader : io/sentry/ObjectReader {

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

@@ -16,18 +16,20 @@ public final class LoggerPropertiesUtil {
   /**
    * 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.
+   * reported in an ad-hoc context.
    *
    * @param event the Sentry event to add tags to
    * @param targetKeys the list of property keys to apply as tags
    * @param properties the properties map (e.g. MDC) - this map will be modified by removing
    *     properties which were applied as tags
+   * @param contextName the name of the context to use for leftover properties
    */
   @ApiStatus.Internal
   public static void applyPropertiesToEvent(
       final @NotNull SentryEvent event,
       final @NotNull List<String> targetKeys,
-      final @NotNull Map<String, String> properties) {
+      final @NotNull Map<String, String> properties,
+      final @NotNull String contextName) {
     if (!targetKeys.isEmpty() && !properties.isEmpty()) {
       for (final String key : targetKeys) {
         final @Nullable String value = properties.remove(key);
@@ -37,10 +39,17 @@ public static void applyPropertiesToEvent(
       }
     }
     if (!properties.isEmpty()) {
-      event.getContexts().put("MDC", properties);
+      event.getContexts().put(contextName, properties);
     }
   }
 
+  public static void applyPropertiesToEvent(
+      final @NotNull SentryEvent event,
+      final @NotNull List<String> targetKeys,
+      final @NotNull Map<String, String> properties) {
+    applyPropertiesToEvent(event, targetKeys, properties, "MDC");
+  }
+
   /**
    * Applies logger properties from a properties map to SentryAttributes for logs. Only the
    * properties with keys that are found in `targetKeys` will be applied as attributes. Properties