improve

Author: lcian

CHANGELOG.md

@@ -6,8 +6,9 @@
 
 - Attach MDC properties to logs as attributes ([#4786](https://github.com/getsentry/sentry-java/pull/4786))
   - MDC properties set using supported logging frameworks (Logback, Log4j2, java.util.Logging) are now attached to structured logs as attributes
-  - All properties are sent, and they're subject to server-side data scrubbing. To avoid sending certain properties, use the `beforeSendLog` hook.
   - This means that you will be able to filter/aggregate logs in the product based on these properties.
+  - All properties are sent. To avoid sending certain properties, use the `beforeSendLog` hook. You can also set up [Advanced Data
+    Scrubbing rules](https://docs.sentry.io/security-legal-pii/scrubbing/advanced-datascrubbing/) to redact sensitive information.
   - Note that keys containing spaces are not supported.
 
 ## 8.23.0

sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt

@@ -557,12 +557,11 @@ class SentryHandlerTest {
   }
 
   @Test
-  fun `sets contextTags from MDC as attributes on logs`() {
-    fixture = Fixture(minimumLevel = Level.INFO, contextTags = listOf("sessionId", "operationId"))
+  fun `sets properties from MDC as attributes on logs`() {
+    fixture = Fixture(minimumLevel = Level.INFO, contextTags = listOf("someTag"))
 
-    MDC.put("sessionId", "session-123")
-    MDC.put("operationId", "op-456")
-    MDC.put("otherTag", "otherValue") // Should not be included in attributes
+    MDC.put("someTag", "someValue")
+    MDC.put("otherTag", "otherValue")
     fixture.logger.info("testing context tags in logs")
 
     Sentry.flush(1000)
@@ -573,10 +572,8 @@ class SentryHandlerTest {
           val log = logs.items.first()
           assertEquals("testing context tags in logs", log.body)
           val attributes = log.attributes!!
-          assertEquals("session-123", attributes["sessionId"]?.value)
-          assertEquals("op-456", attributes["operationId"]?.value)
-          assertNull(attributes["otherTag"]) // Should not be included as it's not in contextTags
-          assertEquals("auto.log.jul", attributes["sentry.origin"]?.value)
+          assertEquals("someValue", attributes["someTag"]?.value)
+          assertEquals("otherValue", attributes["otherTag"]?.value)
         }
       )
   }

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

@@ -593,14 +593,13 @@ class SentryAppenderTest {
   }
 
   @Test
-  fun `sets contextTags from ThreadContext as attributes on logs`() {
+  fun `sets properties from ThreadContext as attributes on logs`() {
     val logger =
-      fixture.getSut(minimumLevel = Level.INFO, contextTags = listOf("traceId", "spanId"))
+      fixture.getSut(minimumLevel = Level.INFO, contextTags = listOf("someTag"))
     ScopesAdapter.getInstance().options.logs.isEnabled = true
 
-    ThreadContext.put("traceId", "trace-123")
-    ThreadContext.put("spanId", "span-456")
-    ThreadContext.put("otherTag", "otherValue") // Should not be included in attributes
+    ThreadContext.put("someTag", "someValue")
+    ThreadContext.put("otherTag", "otherValue")
     logger.info("testing context tags in logs")
 
     Sentry.flush(1000)
@@ -611,10 +610,8 @@ class SentryAppenderTest {
           val log = logs.items.first()
           assertEquals("testing context tags in logs", log.body)
           val attributes = log.attributes!!
-          assertEquals("trace-123", attributes["traceId"]?.value)
-          assertEquals("span-456", attributes["spanId"]?.value)
-          assertNull(attributes["otherTag"]) // Should not be included as it's not in contextTags
-          assertEquals("auto.log.log4j2", attributes["sentry.origin"]?.value)
+          assertEquals("someValue", attributes["someTag"]?.value)
+          assertEquals("otherValue", attributes["otherTag"]?.value)
         }
       )
   }

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

@@ -823,16 +823,15 @@ class SentryAppenderTest {
   }
 
   @Test
-  fun `sets contextTags from MDC as attributes on logs`() {
+  fun `sets properties from MDC as attributes on logs`() {
     fixture =
       Fixture(
         minimumLevel = Level.INFO,
         enableLogs = true,
-        contextTags = listOf("requestId", "userId"),
+        contextTags = listOf("someTag"),
       )
-    MDC.put("requestId", "req-123")
-    MDC.put("userId", "user-456")
-    MDC.put("otherTag", "otherValue") // Should not be included in attributes
+    MDC.put("someTag", "someValue")
+    MDC.put("otherTag", "otherValue")
     fixture.logger.info("testing context tags in logs")
 
     Sentry.flush(1000)
@@ -843,10 +842,8 @@ class SentryAppenderTest {
           val log = logs.items.first()
           assertEquals("testing context tags in logs", log.body)
           val attributes = log.attributes!!
-          assertEquals("req-123", attributes["requestId"]?.value)
-          assertEquals("user-456", attributes["userId"]?.value)
-          assertNull(attributes["otherTag"]) // Should not be included as it's not in contextTags
-          assertEquals("auto.log.logback", attributes["sentry.origin"]?.value)
+          assertEquals("someValue", attributes["someTag"]?.value)
+          assertEquals("otherValue", attributes["otherTag"]?.value)
         }
       )
   }