Merge pull request wso2#2233 from RakhithaRR/AI-5273

[4.2.0] Add a synapse property to handle exclusing payload details in error logs

Author: isudana

modules/core/src/main/java/org/apache/synapse/SynapseConstants.java

@@ -609,6 +609,7 @@ public enum ENDPOINT_TIMEOUT_TYPE { ENDPOINT_TIMEOUT, GLOBAL_TIMEOUT, HTTP_CONNE
     public static final String MAX_FAILOVER_RECUSIVE_RETRIES_CONFIG = "maximum.failover.recursive.retries";
     public static final String SUSPEND_DURATION_ON_MAX_RECURSIVE_FAILOVER_CONFIG =
             "suspend.duration.on.maximum.recursive.failover";
+    public static final String EXCLUDE_PAYLOAD_DETAILS_FROM_ERROR = "exclude.payload.details.from.error";
 
     /**
      * Synapse Configuration holder property name, used for handling synapse import deployments

modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2Sender.java

@@ -38,6 +38,7 @@
 import org.apache.synapse.SynapseHandler;
 import org.apache.synapse.commons.throttle.core.ConcurrentAccessController;
 import org.apache.synapse.commons.throttle.core.ConcurrentAccessReplicator;
+import org.apache.synapse.config.SynapsePropertiesLoader;
 import org.apache.synapse.endpoints.EndpointDefinition;
 import org.apache.synapse.inbound.InboundEndpointConstants;
 import org.apache.synapse.inbound.InboundResponseSender;
@@ -61,6 +62,8 @@ public class Axis2Sender {
      * Content type header name.
      */
     private static final String CONTENT_TYPE_STRING = "Content-Type";
+    private static final boolean removeHeaders = SynapsePropertiesLoader
+            .getBooleanProperty(SynapseConstants.EXCLUDE_PAYLOAD_DETAILS_FROM_ERROR, false);
 
     /**
      * Send a message out from the Synapse engine to an external service
@@ -299,7 +302,7 @@ private static String getResponseMessage(MessageContext msgContext) {
             }
             Map<String, Object> mHeader = (Map<String, Object>) msgContext.getProperty
                     (org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS);
-            if (mHeader != null) {
+            if (!removeHeaders && mHeader != null) {
                 for (String strKey : mHeader.keySet()) {
                     sb.append(strKey + ":" + mHeader.get(strKey).toString() + ",");
                 }