Improve analytics data handler by including additional params

components/apimgt/org.wso2.carbon.apimgt.common.analytics/src/main/java/org/wso2/carbon/apimgt/common/analytics/collectors/impl/CommonRequestDataCollector.java

@@ -31,7 +31,7 @@
  * Contain the common data collectors.
  */
 public abstract class CommonRequestDataCollector extends AbstractRequestDataCollector {
-    private static final Log log = LogFactory.getLog(SuccessRequestDataCollector.class);
+    private static final Log log = LogFactory.getLog(CommonRequestDataCollector.class);
 
     public CommonRequestDataCollector(AnalyticsDataProvider provider) {
         super(provider);

components/apimgt/org.wso2.carbon.apimgt.common.analytics/src/main/java/org/wso2/carbon/apimgt/common/analytics/collectors/impl/SuccessRequestDataCollector.java

@@ -39,7 +39,6 @@ public class SuccessRequestDataCollector extends CommonRequestDataCollector impl
     private static final Log log = LogFactory.getLog(SuccessRequestDataCollector.class);
     private RequestDataPublisher processor;
     private AnalyticsDataProvider provider;
-
     public SuccessRequestDataCollector(AnalyticsDataProvider provider, RequestDataPublisher processor) {
         super(provider);
         this.processor = processor;

components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/WebsocketHandler.java

@@ -129,6 +129,10 @@
                 if (APIUtil.isAnalyticsEnabled()) {
                     WebSocketUtils.setApiPropertyToChannel(ctx, Constants.BACKEND_END_TIME_PROPERTY,
                             System.currentTimeMillis());
+                    if (msg instanceof TextWebSocketFrame) {
+                        WebSocketUtils.setApiPropertyToChannel(ctx, Constants.RESPONSE_SIZE,
+                                ((TextWebSocketFrame) msg).text().length());
+                    }
                 }
                 // publish analytics events if analytics is enabled
                 publishSubscribeEvent(ctx);

components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/WebsocketInboundHandler.java

@@ -269,6 +269,10 @@
                 if (APIUtil.isAnalyticsEnabled()) {
                     WebSocketUtils.setApiPropertyToChannel(ctx, Constants.REQUEST_END_TIME_PROPERTY,
                             System.currentTimeMillis());
+                    if (msg instanceof TextWebSocketFrame) {
+                        WebSocketUtils.setApiPropertyToChannel(ctx, Constants.RESPONSE_SIZE,
+                                ((TextWebSocketFrame) msg).text().length());
+                    }
                 }
                 publishPublishEvent(ctx);
             }

components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/analytics/Constants.java

@@ -33,6 +33,8 @@ public class Constants {
     public static final String REQUEST_CACHE_HIT = "api.analytics.cacheHit";
     public static final String API_USER_NAME_KEY = "userName";
     public static final String API_CONTEXT_KEY = "apiContext";
+    public static final String RESPONSE_SIZE = "responseSize";
+    public static final String RESPONSE_CONTENT_TYPE = "responseContentType";
     public static final String API_ANALYTICS_CUSTOM_DATA_PROVIDER_CLASS = "publisher.custom.data.provider.class";
 
     public static final String REGION_ID_PROP = "apim.gw.region";
@@ -68,6 +70,6 @@ public static final class ERROR_CODE_RANGES {
     public static final String API_GOOGLE_ANALYTICS_MEASUREMENT_ID = "MeasurementID";
     public static final String API_GOOGLE_ANALYTICS_API_SECRET = "APISecret";
     public static final String X_FORWARDED_FOR_HEADER = "X-Forwarded-For";
-
     public static final String HEADER_X_FORWARDED_FOR = "X-FORWARDED-FOR";
+    public static final String BUILD_RESPONSE_MESSAGE_CONFIG = "build_response_message";
 }

components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/analytics/SynapseAnalyticsDataProvider.java

@@ -17,13 +17,17 @@
 
 package org.wso2.carbon.apimgt.gateway.handlers.analytics;
 
+import org.apache.axiom.soap.SOAPBody;
+import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.http.HttpHeaders;
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.SynapseConstants;
 import org.apache.synapse.commons.CorrelationConstants;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.synapse.rest.RESTConstants;
+import org.apache.synapse.transport.passthru.util.RelayUtils;
 import org.wso2.carbon.apimgt.common.analytics.collectors.AnalyticsCustomDataProvider;
 import org.wso2.carbon.apimgt.common.analytics.collectors.AnalyticsDataProvider;
 import org.wso2.carbon.apimgt.common.analytics.exceptions.DataNotFoundException;
@@ -43,22 +47,30 @@
 import org.wso2.carbon.apimgt.gateway.handlers.security.AuthenticationContext;
 import org.wso2.carbon.apimgt.gateway.internal.ServiceReferenceHolder;
 import org.wso2.carbon.apimgt.impl.APIConstants;
+import org.wso2.carbon.apimgt.impl.APIManagerConfiguration;
 import org.wso2.carbon.apimgt.keymgt.SubscriptionDataHolder;
 import org.wso2.carbon.apimgt.keymgt.model.SubscriptionDataStore;
 import org.wso2.carbon.apimgt.keymgt.model.exception.DataLoadingException;
 import org.wso2.carbon.apimgt.keymgt.model.impl.SubscriptionDataLoaderImpl;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
+import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.apache.axis2.context.MessageContext.TRANSPORT_HEADERS;
+import static org.wso2.carbon.apimgt.gateway.handlers.analytics.Constants.UNKNOWN_VALUE;
+
 public class SynapseAnalyticsDataProvider implements AnalyticsDataProvider {
 
     private static final Log log = LogFactory.getLog(SynapseAnalyticsDataProvider.class);
     private MessageContext messageContext;
     private AnalyticsCustomDataProvider analyticsCustomDataProvider;
+    private Boolean buildResponseMessage = null;
 
     public SynapseAnalyticsDataProvider(MessageContext messageContext) {
 
@@ -337,6 +349,8 @@
         }
         customProperties.put(Constants.API_USER_NAME_KEY, getUserName());
         customProperties.put(Constants.API_CONTEXT_KEY, getApiContext());
+        customProperties.put(Constants.RESPONSE_SIZE, getResponseSize());
+        customProperties.put(Constants.RESPONSE_CONTENT_TYPE, getResponseContentType());
         return customProperties;
     }
 
@@ -421,4 +435,49 @@
         return System.currentTimeMillis() - backendEndTime;
     }
 
+    public int getResponseSize() {
+        int responseSize = 0;
+        if (buildResponseMessage == null) {
+            Map<String,String> configs = APIManagerConfiguration.getAnalyticsProperties();
+            if (configs.containsKey(Constants.BUILD_RESPONSE_MESSAGE_CONFIG)) {
+                buildResponseMessage = Boolean.parseBoolean(configs.get(Constants.BUILD_RESPONSE_MESSAGE_CONFIG));
+            } else {
+                buildResponseMessage = false;
+            }
+        }
+        Map headers = (Map) messageContext.getProperty(TRANSPORT_HEADERS);
+        if (headers != null  && headers.get(HttpHeaders.CONTENT_LENGTH) != null) {
+            responseSize = Integer.parseInt(headers.get(HttpHeaders.CONTENT_LENGTH).toString());
+        }
+        if (responseSize == 0 && buildResponseMessage) {
+            try {
+                RelayUtils.buildMessage(((Axis2MessageContext) messageContext).getAxis2MessageContext());
+            } catch (IOException ex) {
+                //In case of an exception, it won't be propagated up,and set response size to 0
+                log.error("Error occurred while building the message to" +
+                        " calculate the response body size", ex);
+            } catch (XMLStreamException ex) {
+                log.error("Error occurred while building the message to calculate the response" +
+                        " body size", ex);
+            }
+
+            SOAPEnvelope env = messageContext.getEnvelope();
+            if (env != null) {
+                SOAPBody soapbody = env.getBody();
+                if (soapbody != null) {
+                    byte[] size = soapbody.toString().getBytes(Charset.defaultCharset());
+                    responseSize =  size.length;
+                }
+            }
+        }
+        return responseSize;
+    }
+
+    public String getResponseContentType() {
+        Map headers = (Map) messageContext.getProperty(TRANSPORT_HEADERS);
+        if (headers != null && headers.get(HttpHeaders.CONTENT_TYPE) != null) {
+            return headers.get(HttpHeaders.CONTENT_TYPE).toString();
+        }
+        return UNKNOWN_VALUE;
+    }
 }

components/apimgt/org.wso2.carbon.apimgt.gateway/src/main/java/org/wso2/carbon/apimgt/gateway/handlers/streaming/websocket/WebSocketAnalyticsDataProvider.java

@@ -315,6 +315,8 @@
         }
         customProperties.put(Constants.API_USER_NAME_KEY, getUserName());
         customProperties.put(Constants.API_CONTEXT_KEY, getApiContext());
+        customProperties.put(Constants.RESPONSE_SIZE,
+                WebSocketUtils.getPropertyFromChannel(Constants.RESPONSE_SIZE, ctx));
         return customProperties;
     }