Update logging markers and improve data classification

Replaced `PII_MARKER` with `SENSITIVE_DATA_MARKER`. Introduced `RESTRICTED_DATA_MARKER`, `REGULATED_DATA_MARKER` and `PUBLIC_DATA_MARKER`

Updated associated logging logic and tests to reflect these changes.

Signed-off-by: Konstantin Pavlov <{ID}+{username}@users.noreply.github.com>

Author: Konstantin Pavlov

spring-ai-core/src/main/java/org/springframework/ai/converter/BeanOutputConverter.java

@@ -41,7 +41,7 @@
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.lang.NonNull;
 
-import static org.springframework.ai.util.LoggingMarkers.PII_MARKER;
+import static org.springframework.ai.util.LoggingMarkers.SENSITIVE_DATA_MARKER;
 
 /**
  * An implementation of {@link StructuredOutputConverter} that transforms the LLM output
@@ -182,8 +182,8 @@ public T convert(@NonNull String text) {
 			return (T) this.objectMapper.readValue(text, this.objectMapper.constructType(this.type));
 		}
 		catch (JsonProcessingException e) {
-			logger.error(PII_MARKER,
-					"Could not parse the given text to the desired target type:" + text + " into " + this.type);
+			logger.error(SENSITIVE_DATA_MARKER,
+					"Could not parse the given text to the desired target type: \"{}\" into {}", text, this.type);
 			throw new RuntimeException(e);
 		}
 	}

spring-ai-core/src/main/java/org/springframework/ai/util/LoggingMarkers.java

@@ -6,20 +6,64 @@
 /**
  * Utility class that provides predefined SLF4J {@link Marker} instances used in logging
  * operations within the application. <br>
- * This class is not intended to be instantiated.
+ * This class is not intended to be instantiated, but is open for extension.
  */
 public class LoggingMarkers {
 
 	/**
-	 * Marker instance representing Personally Identifiable Information (PII) used in
-	 * logging operations to classify or tag log entries for sensitive data. This can be
-	 * utilized to allow selective filtering, handling, or analysis of log messages
-	 * containing PII.
+	 * Marker used to identify log statements associated with <strong>sensitive
+	 * data</strong>, such as:
+	 * <ul>
+	 * <li>Internal business information</li>
+	 * <li>Employee data</li>
+	 * <li>Customer non-regulated data</li>
+	 * <li>Business processes and logic</li>
+	 * <li>etc.</li>
+	 * </ul>
+	 * Typically, logging this information should be avoided
 	 */
-	public static final Marker PII_MARKER = MarkerFactory.getMarker("PII");
+	public static final Marker SENSITIVE_DATA_MARKER = MarkerFactory.getMarker("SENSITIVE");
 
-	private LoggingMarkers() {
-		// Prevent instantiation of this utility class
-	}
+	/**
+	 * Marker used to identify log statements associated with <strong>restricted
+	 * data</strong>, such as:
+	 * <ul>
+	 * <li>Authentication credentials</li>
+	 * <li>Keys and secrets</li>
+	 * <li>Core intellectual property</li>
+	 * <li>Critical security configs</li>
+	 * <li>Trade secrets</li>
+	 * <li>etc.</li>
+	 * </ul>
+	 * Logging of such information is usually prohibited in any circumstances
+	 */
+	public static final Marker RESTRICTED_DATA_MARKER = MarkerFactory.getMarker("RESTRICTED");
+
+	/**
+	 * Marker used to identify log statements associated with <strong>regulated
+	 * data</strong>, such as:
+	 * <ul>
+	 * <li>PCI (credit card data)</li>
+	 * <li>PHI (health information)</li>
+	 * <li>PII (personally identifiable info)</li>
+	 * <li>Financial records</li>
+	 * <li>Compliance-controlled data</li>
+	 * <li>etc.</li>
+	 * </ul>
+	 * Logging of such information should be avoided
+	 */
+	public static final Marker REGULATED_DATA_MARKER = MarkerFactory.getMarker("REGULATED");
+
+	/**
+	 * Marker used to identify log statements associated with <strong>public
+	 * data</strong>, such as:
+	 * <ul>
+	 * <li>Public documentation</li>
+	 * <li>Marketing materials</li>
+	 * <li>etc.</li>
+	 * </ul>
+	 * There are no restriction for
+	 */
+	public static final Marker PUBLIC_DATA_MARKER = MarkerFactory.getMarker("PUBLIC");
 
 }

spring-ai-core/src/test/java/org/springframework/ai/converter/BeanOutputConverterTest.java

@@ -41,7 +41,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.springframework.ai.util.LoggingMarkers.PII_MARKER;
+import static org.springframework.ai.util.LoggingMarkers.SENSITIVE_DATA_MARKER;
 
 /**
  * @author Sebastian Ullrich
@@ -160,9 +160,11 @@ void failToConvertInvalidJson() {
 			assertThatThrownBy(() -> converter.convert("{invalid json")).hasCauseInstanceOf(JsonParseException.class);
 			assertThat(logAppender.list).hasSize(1);
 			final var loggingEvent = logAppender.list.get(0);
-			assertThat(loggingEvent.getMessage()).isEqualTo(
-					"Could not parse the given text to the desired target type:{invalid json into " + TestClass.class);
-			assertThat(loggingEvent.getMarkerList()).contains(PII_MARKER);
+			assertThat(loggingEvent.getFormattedMessage())
+				.isEqualTo("Could not parse the given text to the desired target type: \"{invalid json\" into "
+						+ TestClass.class);
+
+			assertThat(loggingEvent.getMarkerList()).contains(SENSITIVE_DATA_MARKER);
 		}
 
 		@Test