Author: indika
Date: Tue Feb 6 03:20:26 2007
New Revision: 504080
URL: http://svn.apache.org/viewvc?view=rev&rev=504080
Log:
enable fault count in statistics
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsStack.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/EndPointStatisticsStack.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/ProxyServiceStatisticsStack.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/SequenceStatisticsStack.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyServiceMessageReceiver.java
Tue Feb 6 03:20:26 2007
@@ -113,7 +113,8 @@
statisticsEnable = (org.apache.synapse.Constants.STATISTICS_ON
== endpoint.getStatisticsEnable());
if (endPointName != null && statisticsEnable) {
EndPointStatisticsStack endPointStatisticsStack = new
EndPointStatisticsStack();
- endPointStatisticsStack.put(endPointName,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable);
+ boolean isFault =synCtx.getEnvelope().getBody().hasFault();
+ endPointStatisticsStack.put(endPointName,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable,isFault);
synCtx.setCorrelationProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK,
endPointStatisticsStack);
}
AxisEngine ae = new
AxisEngine(axisOutMsgContext.getConfigurationContext());
@@ -152,7 +153,8 @@
statisticsEnable = (org.apache.synapse.Constants.STATISTICS_ON
== currentProxyService.getStatisticsEnable());
if (statisticsEnable) {
ProxyServiceStatisticsStack proxyServiceStatisticsStack =
new ProxyServiceStatisticsStack();
- proxyServiceStatisticsStack.put(name,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable);
+ boolean isFault =synCtx.getEnvelope().getBody().hasFault();
+ proxyServiceStatisticsStack.put(name,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable,isFault);
synCtx.setCorrelationProperty(org.apache.synapse.Constants.PROXYSERVICE_STATISTICS_STACK,
proxyServiceStatisticsStack);
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/SynapseMessageReceiver.java
Tue Feb 6 03:20:26 2007
@@ -56,7 +56,8 @@
synCtx.setCorrelationProperty(org.apache.synapse.Constants.SYNAPSESERVICE_STATISTICS_STACK,
synapseServiceStack);
}
String name = "SynapseService";
- synapseServiceStack.put(name, System.currentTimeMillis(),
!synCtx.isResponse(), true);
+ boolean isFault =synCtx.getEnvelope().getBody().hasFault();
+ synapseServiceStack.put(name, System.currentTimeMillis(),
!synCtx.isResponse(), true,isFault);
synCtx.getEnvironment().injectMessage(synCtx);
// Response handling mechanism for 200/202 and 5XX
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/base/SequenceMediator.java
Tue Feb 6 03:20:26 2007
@@ -75,7 +75,8 @@
synCtx.setProperty(Constants.SEQUENCE_STATISTICS_STACK,
sequenceStack);
}
String seqName = (name == null ? "anonymous" : name);
- sequenceStack.put(seqName, System.currentTimeMillis(),
!synCtx.isResponse(), isStatisticsEnable);
+ boolean isFault =synCtx.getEnvelope().getBody().hasFault();
+ sequenceStack.put(seqName, System.currentTimeMillis(),
!synCtx.isResponse(), isStatisticsEnable,isFault);
}
try {
if (shouldTrace) {
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
Tue Feb 6 03:20:26 2007
@@ -117,7 +117,8 @@
boolean statisticsEnable =
(org.apache.synapse.Constants.STATISTICS_ON ==
singleEndpoint.getStatisticsEnable());
if (endPointName != null && statisticsEnable) {
EndPointStatisticsStack endPointStatisticsStack = new
EndPointStatisticsStack();
- endPointStatisticsStack.put(endPointName,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable);
+ boolean isFault =synCtx.getEnvelope().getBody().hasFault();
+ endPointStatisticsStack.put(endPointName,
System.currentTimeMillis(), !synCtx.isResponse(), statisticsEnable,isFault);
synCtx.setCorrelationProperty(org.apache.synapse.Constants.ENDPOINT_STATISTICS_STACK,
endPointStatisticsStack);
}
synCtx.setTo(new EndpointReference(eprAddress));
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsStack.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsStack.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsStack.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsStack.java
Tue Feb 6 03:20:26 2007
@@ -29,19 +29,22 @@
* @param initTime
* @param isInFlow
* @param isStatisticsEnable
+ * @param isFault
*/
- public void put(String key,long initTime, boolean isInFlow, boolean
isStatisticsEnable);
+ public void put(String key,long initTime, boolean isInFlow, boolean
isStatisticsEnable,boolean isFault);
/**
* This method used to report the latest statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector);
+ public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault);
/**
* This method used to unreported all statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector);
+ public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault);
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/StatisticsUtils.java
Tue Feb 6 03:20:26 2007
@@ -37,13 +37,14 @@
public static void processProxyServiceStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector =
getStatisticsCollector(synCtx);
+ boolean isFault = synCtx.getEnvelope().getBody().hasFault();
ProxyServiceStatisticsStack proxyServiceStatisticsStack =
(ProxyServiceStatisticsStack)
synCtx.getProperty(Constants.PROXYSERVICE_STATISTICS_STACK);
if (proxyServiceStatisticsStack != null) {
-
proxyServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector);
+
proxyServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
ProxyServiceStatisticsStack synapseServiceStatisticsStack =
(ProxyServiceStatisticsStack)
synCtx.getProperty(Constants.SYNAPSESERVICE_STATISTICS_STACK);
if (synapseServiceStatisticsStack != null) {
-
synapseServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector);
+
synapseServiceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
}
@@ -54,9 +55,10 @@
*/
public static void processEndPointStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector =
getStatisticsCollector(synCtx);
+ boolean isFault = synCtx.getEnvelope().getBody().hasFault();
EndPointStatisticsStack endPointStatisticsStack =
(EndPointStatisticsStack)
synCtx.getProperty(Constants.ENDPOINT_STATISTICS_STACK);
if (endPointStatisticsStack != null) {
-
endPointStatisticsStack.reportToStatisticsCollector(statisticsCollector);
+
endPointStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
}
@@ -67,9 +69,10 @@
*/
public static void processSequenceStatistics(MessageContext synCtx) {
StatisticsCollector statisticsCollector =
getStatisticsCollector(synCtx);
+ boolean isFault = synCtx.getEnvelope().getBody().hasFault();
SequenceStatisticsStack sequenceStatisticsStack =
(SequenceStatisticsStack)
synCtx.getProperty(Constants.SEQUENCE_STATISTICS_STACK);
if (sequenceStatisticsStack != null) {
-
sequenceStatisticsStack.reportToStatisticsCollector(statisticsCollector);
+
sequenceStatisticsStack.reportToStatisticsCollector(statisticsCollector,isFault);
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/EndPointStatisticsStack.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/EndPointStatisticsStack.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/EndPointStatisticsStack.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/EndPointStatisticsStack.java
Tue Feb 6 03:20:26 2007
@@ -33,28 +33,32 @@
private boolean isInFlow;
/** To check whether statistics is enabled or not */
private boolean isStatisticsEnable;
-
+ /** To indicate whether this is fault or not*/
+ private boolean isFault;
/**
* To put statistics
* @param key - The name of the End Point
* @param initTime
* @param isInFlow
* @param isStatisticsEnable
+ * @param isFault
*/
- public void put(String key, long initTime, boolean isInFlow, boolean
isStatisticsEnable) {
+ public void put(String key, long initTime, boolean isInFlow, boolean
isStatisticsEnable,boolean isFault) {
this.endPointName = key;
this.initTime = initTime;
this.isInFlow = isInFlow;
this.isStatisticsEnable = isStatisticsEnable;
+ this.isFault = isFault;
}
/**
* This method used to report the latest statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector) {
+ public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
if (isStatisticsEnable && endPointName!=null) {
- statisticsCollector.reportForEndPoint(endPointName, !isInFlow,
initTime, System.currentTimeMillis(), false);
+ statisticsCollector.reportForEndPoint(endPointName, !isInFlow,
initTime, System.currentTimeMillis(), isFault);
endPointName =null;
}
}
@@ -63,7 +67,7 @@
* This method used to unreported all statistics to the
StatisticsCollector
* @param statisticsCollector
*/
- public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector) {
- reportToStatisticsCollector(statisticsCollector);
+ public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
+ reportToStatisticsCollector(statisticsCollector,isFault);
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/ProxyServiceStatisticsStack.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/ProxyServiceStatisticsStack.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/ProxyServiceStatisticsStack.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/ProxyServiceStatisticsStack.java
Tue Feb 6 03:20:26 2007
@@ -33,7 +33,10 @@
private long inTimeForInFlow = -1;
/** The time which starts to collect statistics for OUT flow */
private long inTimeForOutFlow = -1;
-
+ /** To indicate whether IN Flow is fault or not*/
+ private boolean isINFault;
+ /** To indicate whether OUT Flow is fault or not*/
+ private boolean isOUTFault;
/**
* To put a statistics
* @param key - The Name of the proxy service
@@ -41,12 +44,13 @@
* @param isInFlow
* @param isStatisticsEnable
*/
- public void put(String key, long initTime, boolean isInFlow, boolean
isStatisticsEnable) {
+ public void put(String key, long initTime, boolean isInFlow, boolean
isStatisticsEnable,boolean isFault) {
if (isInFlow) {
this.proxyServiceName = key;
this.isStatisticsEnable = isStatisticsEnable;
this.inTimeForInFlow = initTime;
+ this.isINFault = isFault;
}
}
@@ -54,14 +58,15 @@
* This method used to report the latest statistics to the
StatisticsCollector
* @param statisticsCollector
*/
- public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector) {
+ public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
if (proxyServiceName != null && isStatisticsEnable && inTimeForInFlow
!= -1) {
inTimeForOutFlow = System.currentTimeMillis();
- statisticsCollector.reportForProxyService(proxyServiceName, false,
inTimeForInFlow, inTimeForOutFlow, false);
+ isOUTFault = isFault;
+ statisticsCollector.reportForProxyService(proxyServiceName, false,
inTimeForInFlow, inTimeForOutFlow, isINFault);
inTimeForInFlow = -1;
} else if (inTimeForOutFlow != -1) {
- statisticsCollector.reportForProxyService(proxyServiceName, true,
inTimeForOutFlow, System.currentTimeMillis(), false);
+ statisticsCollector.reportForProxyService(proxyServiceName, true,
inTimeForOutFlow, System.currentTimeMillis(), isOUTFault);
inTimeForOutFlow = -1;
}
}
@@ -69,8 +74,9 @@
/**
* This method used to unreported all statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector) {
- reportToStatisticsCollector(statisticsCollector);
+ public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
+ reportToStatisticsCollector(statisticsCollector,isFault);
}
}
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/SequenceStatisticsStack.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/SequenceStatisticsStack.java?view=diff&rev=504080&r1=504079&r2=504080
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/SequenceStatisticsStack.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/statistics/impl/SequenceStatisticsStack.java
Tue Feb 6 03:20:26 2007
@@ -36,22 +36,25 @@
* @param initTime
* @param isInFlow
* @param isStatisticsEnable
+ * @param isFault
*/
- public void put(String sequenceName, long initTime, boolean isInFlow,
boolean isStatisticsEnable) {
- sequenceStatisticsList.add(new SequenceStatistics(sequenceName,
initTime, isInFlow, isStatisticsEnable));
+ public void put(String sequenceName, long initTime, boolean isInFlow,
boolean isStatisticsEnable,boolean isFault) {
+ sequenceStatisticsList.add(new SequenceStatistics(sequenceName,
initTime, isInFlow, isStatisticsEnable,isFault));
}
/**
* This method used to report the latest statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector) {
+ public void reportToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
popSequenceStatistics(sequenceStatisticsList.size() - 1,
statisticsCollector);
}
/**
* This method used to unreported all statistics to the
StatisticsCollector
* @param statisticsCollector
+ * @param isFault
*/
- public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector) {
+ public void reportAllToStatisticsCollector(StatisticsCollector
statisticsCollector,boolean isFault) {
for (int i = sequenceStatisticsList.size(); i < 0; i--) {
popSequenceStatistics(i, statisticsCollector);
}
@@ -66,7 +69,7 @@
SequenceStatistics sequenceStatistics = (SequenceStatistics)
sequenceStatisticsList.get(index);
if (sequenceStatistics != null) {
if (sequenceStatistics.isStatisticsEnable &&
sequenceStatistics.sequenceName != null) {
-
statisticsCollector.reportForSequence(sequenceStatistics.sequenceName,
!sequenceStatistics.isInFlow, sequenceStatistics.initTime,
System.currentTimeMillis(), false);
+
statisticsCollector.reportForSequence(sequenceStatistics.sequenceName,
!sequenceStatistics.isInFlow, sequenceStatistics.initTime,
System.currentTimeMillis(), sequenceStatistics.isFault);
}
sequenceStatisticsList.remove(index);
}
@@ -85,12 +88,15 @@
boolean isInFlow;
/** To check whether statistics is enabled or not */
boolean isStatisticsEnable;
+ /** To indicate whether this is fault or not*/
+ private boolean isFault;
- public SequenceStatistics(String sequenceName, long initTime, boolean
inFlow, boolean statisticsEnable) {
+ public SequenceStatistics(String sequenceName, long initTime, boolean
inFlow, boolean statisticsEnable,boolean isFault) {
this.sequenceName = sequenceName;
this.initTime = initTime;
isInFlow = inFlow;
isStatisticsEnable = statisticsEnable;
+ this.isFault = isFault;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
