Only set log template if message differs from template

Author: adinauer

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

@@ -154,9 +154,12 @@ protected void captureLog(@NotNull LogRecord loggingEvent) {
       message = loggingEvent.getResourceBundle().getString(loggingEvent.getMessage());
     }
 
-    attributes.add(SentryAttribute.stringAttribute("sentry.message.template", message));
-
     final @NotNull String formattedMessage = maybeFormatted(arguments, message);
+
+    if (!formattedMessage.equals(message)) {
+      attributes.add(SentryAttribute.stringAttribute("sentry.message.template", message));
+    }
+
     final @NotNull SentryLogParameters params = SentryLogParameters.create(attributes);
     params.setOrigin("auto.log.jul");
 

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

@@ -222,11 +222,14 @@ protected void captureLog(@NotNull LogEvent loggingEvent) {
     final @Nullable Object[] arguments = loggingEvent.getMessage().getParameters();
     final @NotNull SentryAttributes attributes = SentryAttributes.of();
 
-    attributes.add(
-        SentryAttribute.stringAttribute(
-            "sentry.message.template", loggingEvent.getMessage().getFormat()));
-
+    final @Nullable String nonFormattedMessage = loggingEvent.getMessage().getFormat();
     final @NotNull String formattedMessage = loggingEvent.getMessage().getFormattedMessage();
+
+    if (nonFormattedMessage != null && !formattedMessage.equals(nonFormattedMessage)) {
+      attributes.add(
+          SentryAttribute.stringAttribute("sentry.message.template", nonFormattedMessage));
+    }
+
     final @NotNull SentryLogParameters params = SentryLogParameters.create(attributes);
     params.setOrigin("auto.log.log4j2");
 

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

@@ -183,15 +183,18 @@ protected void captureLog(@NotNull ILoggingEvent loggingEvent) {
 
     @Nullable Object[] arguments = null;
     final @NotNull SentryAttributes attributes = SentryAttributes.of();
+    final @NotNull String formattedMessage = formatted(loggingEvent);
 
     // if encoder is set we treat message+params as PII as encoders may be used to mask/strip PII
     if (encoder == null || ScopesAdapter.getInstance().getOptions().isSendDefaultPii()) {
-      attributes.add(
-          SentryAttribute.stringAttribute("sentry.message.template", loggingEvent.getMessage()));
+      final @Nullable String nonFormattedMessage = loggingEvent.getMessage();
+      if (nonFormattedMessage != null && !formattedMessage.equals(nonFormattedMessage)) {
+        attributes.add(
+            SentryAttribute.stringAttribute("sentry.message.template", nonFormattedMessage));
+      }
       arguments = loggingEvent.getArgumentArray();
     }
 
-    final @NotNull String formattedMessage = formatted(loggingEvent);
     final @NotNull SentryLogParameters params = SentryLogParameters.create(attributes);
     params.setOrigin("auto.log.logback");