Relax check to not throw error for non-overlapping logging attributes.

PiperOrigin-RevId: 910040392

Author: Soy Authors

java/src/com/google/template/soy/jbcsrc/api/OutputAppendable.java

@@ -27,6 +27,7 @@
 import com.google.template.soy.data.LoggingAdvisingAppendable;
 import com.google.template.soy.data.LoggingFunctionInvocation;
 import com.google.template.soy.logging.SoyLogger;
+import com.google.template.soy.logging.SoyLogger.LoggingAttrs;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.function.Function;
@@ -173,7 +174,7 @@ public LoggingAdvisingAppendable enterLoggableElement(LogStatement statement) {
     }
     var enterData = logger.enter(statement);
     appendDebugOutput(enterData.debugHtml());
-    var loggingAttrs = enterData.loggingAttrs().orElse(null);
+    LoggingAttrs loggingAttrs = enterData.loggingAttrs().orElse(null);
     if (loggingAttrs != null && depth > 0) {
       loggingAttrs = null; // we cannot render them when logonly is set, so drop them now.
     }
@@ -199,7 +200,7 @@ public LoggingAdvisingAppendable exitLoggableElement() {
   }
 
   private void setLoggingAttrs(@Nullable SoyLogger.LoggingAttrs loggingAttrs) {
-    if (this.loggingAttrs != null) {
+    if (loggingAttrs != null && loggingAttrs.hasOverlappingAttributes(this.loggingAttrs)) {
       googleLogger.atWarning().withStackTrace(StackSize.LARGE).log(
           "a logger configured logging attrs that were not rendered onto an element. Your {velog}"
               + " command must not be wrapping an element, this is undefined behavior.");

java/src/com/google/template/soy/logging/SoyLogger.java

@@ -55,6 +55,13 @@ public static Builder builder() {
 
     abstract boolean hasAnchorAttributes();
 
+    public boolean hasOverlappingAttributes(LoggingAttrs other) {
+      if (other == null) {
+        return false;
+      }
+      return attrs().keySet().stream().anyMatch(other.attrs()::containsKey);
+    }
+
     /** Writes the attributes to the output appendable. */
     public void writeTo(boolean isAnchorTag, Appendable outputAppendable) throws IOException {
       if (hasAnchorAttributes() && !isAnchorTag) {