From 544307559dd581ee40bb177640c29ccc719d098b Mon Sep 17 00:00:00 2001
From: Mohit Godwani <mgodwan@amazon.com>
Date: Mon, 13 Jan 2025 10:55:59 +0530
Subject: [PATCH] Remove user data from logs when not in debug/trace mode

Signed-off-by: Mohit Godwani <mgodwan@amazon.com>
---
 .../action/support/replication/ReplicationOperation.java   | 5 ++---
 .../support/replication/TransportReplicationAction.java    | 2 +-
 .../java/org/opensearch/action/update/UpdateHelper.java    | 7 ++++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
index 9f69d41d83f5b..91861217c101a 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/ReplicationOperation.java
@@ -144,10 +144,9 @@ public void execute() throws Exception {
             finishAsFailed(
                 new UnavailableShardsException(
                     primaryId,
-                    "{} Timeout: [{}], request: [{}]",
+                    "{} Timeout: [{}]",
                     activeShardCountFailure,
-                    request.timeout(),
-                    request
+                    request.timeout()
                 )
             );
             return;
diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java
index 49a96603f6802..637a7a31d78cc 100644
--- a/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java
+++ b/server/src/main/java/org/opensearch/action/support/replication/TransportReplicationAction.java
@@ -1246,7 +1246,7 @@ void finishOnSuccess(Response response) {
         }
 
         void retryBecauseUnavailable(ShardId shardId, String message) {
-            retry(new UnavailableShardsException(shardId, "{} Timeout: [{}], request: [{}]", message, request.timeout(), request));
+            retry(new UnavailableShardsException(shardId, "{} Timeout: [{}]", message, request.timeout()));
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/action/update/UpdateHelper.java b/server/src/main/java/org/opensearch/action/update/UpdateHelper.java
index 19c32f9336df8..c02ec1fbb9cf0 100644
--- a/server/src/main/java/org/opensearch/action/update/UpdateHelper.java
+++ b/server/src/main/java/org/opensearch/action/update/UpdateHelper.java
@@ -58,6 +58,7 @@
 import org.opensearch.index.shard.IndexShard;
 import org.opensearch.script.Script;
 import org.opensearch.script.ScriptService;
+import org.opensearch.script.ScriptType;
 import org.opensearch.script.UpdateScript;
 import org.opensearch.search.lookup.SourceLookup;
 
@@ -128,7 +129,11 @@ Tuple<UpdateOpType, Map<String, Object>> executeScriptedUpsert(Map<String, Objec
 
         if (operation != UpdateOpType.CREATE && operation != UpdateOpType.NONE) {
             // Only valid options for an upsert script are "create" (the default) or "none", meaning abort upsert
-            logger.warn("Invalid upsert operation [{}] for script [{}], doing nothing...", operation, script.getIdOrCode());
+            if (logger.isDebugEnabled() || ScriptType.STORED.equals(script.getType())) {
+                logger.warn("Invalid upsert operation [{}] for script [{}], doing nothing...", operation, script.getIdOrCode());
+            } else {
+                logger.warn("Invalid upsert operation [{}] for given script", operation);
+            }
             operation = UpdateOpType.NONE;
         }