svn commit: r889111 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: SynapseConstants.java endpoints/AbstractEndpoint.java

[indika]

Author: indika
Date: Thu Dec 10 06:29:52 2009
New Revision: 889111

URL: http://svn.apache.org/viewvc?rev=889111&view=rev
Log:
stat per endpoint operation

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java?rev=889111&r1=889110&r2=889111&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseConstants.java
 Thu Dec 10 06:29:52 2009
@@ -147,6 +147,12 @@
         * be preserved */
         public static final String PRESERVE_WS_ADDRESSING = 
"PRESERVE_WS_ADDRESSING";
 
+        /**
+         * The name of the property which specifies the operation name that is
+         * invoked by an endpoint
+        */
+        public static final String ENDPOINT_OPERATION = "endpoint.operation";
+    
         //-- error handling --
         /** An Axis2 message context property indicating a transport send 
failure */
         public static final String SENDING_FAULT = "SENDING_FAULT";

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java?rev=889111&r1=889110&r2=889111&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/endpoints/AbstractEndpoint.java
 Thu Dec 10 06:29:52 2009
@@ -22,10 +22,12 @@
 import org.apache.axis2.clustering.ClusteringAgent;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.transport.base.BaseConstants;
+import org.apache.axis2.description.AxisOperation;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.synapse.*;
 import org.apache.synapse.aspects.ComponentType;
+import org.apache.synapse.aspects.AspectConfiguration;
 import org.apache.synapse.aspects.statistics.StatisticsReporter;
 import org.apache.synapse.commons.jmx.MBeanRegistrar;
 import org.apache.synapse.core.SynapseEnvironment;
@@ -350,8 +352,46 @@
      * @param synCtx the current message
      */
     protected void prepareForEndpointStatistics(MessageContext synCtx) {
-    // Setting Required property to reportForComponent the End Point aspects
+        // Setting Required property to reportForComponent the End Point 
aspects
         if (definition != null && definition.isStatisticsEnable()) {
+            String opName = null;
+
+            if (synCtx.getProperty(SynapseConstants.ENDPOINT_OPERATION) != 
null) {
+                opName = 
synCtx.getProperty(SynapseConstants.ENDPOINT_OPERATION).toString();
+            } else if (synCtx instanceof Axis2MessageContext) {
+                AxisOperation operation
+                        = ((Axis2MessageContext) 
synCtx).getAxis2MessageContext().getAxisOperation();
+                if (operation != null) {
+                    opName = operation.getName().getLocalPart();
+                }
+                if (opName == null ||
+                        
SynapseConstants.SYNAPSE_OPERATION_NAME.getLocalPart().equals(opName)) {
+                    String soapAction = synCtx.getSoapAction();
+                    opName = null;
+                    if (soapAction != null) {
+                        int index = soapAction.indexOf("urn:");
+                        if (index >= 0) {
+                            opName = soapAction.substring("urn:".length());
+                        } else {
+                            opName = soapAction;
+                        }
+                    }
+                }
+            }
+
+            AspectConfiguration oldConfiguration = 
definition.getAspectConfiguration();
+            if (opName != null) {
+                if (oldConfiguration.isStatisticsEnable()) {
+                    AspectConfiguration newConfiguration = new 
AspectConfiguration(
+                            oldConfiguration.getId() + "." + opName);
+                    newConfiguration.enableStatistics();
+                    StatisticsReporter.reportForComponent(synCtx, 
newConfiguration,
+                            ComponentType.ENDPOINT);
+                }
+            } else {
+                StatisticsReporter.reportForComponent(synCtx, oldConfiguration,
+                        ComponentType.ENDPOINT);
+            }
             StatisticsReporter.reportForComponent(synCtx, 
definition.getAspectConfiguration(),
                     ComponentType.ENDPOINT);
         }