Author: cwiklik
Date: Thu Sep 27 18:46:20 2018
New Revision: 1842140
URL: http://svn.apache.org/viewvc?rev=1842140&view=rev
Log:
UIMA-5873 modified to include number of CASes processes in metrics
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/PerformanceMetrics.java
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java?rev=1842140&r1=1842139&r2=1842140&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaAsServiceProcessor.java
Thu Sep 27 18:46:20 2018
@@ -291,14 +291,15 @@ public class UimaAsServiceProcessor exte
String uniqueName = (String)
uniqueNameMethod.invoke(metrics);
Method analysisTimeMethod =
metrics.getClass().getDeclaredMethod("getAnalysisTime");
long analysisTime = (long)
analysisTimeMethod.invoke(metrics);
-
+ Method currentTaskCountMethod =
metrics.getClass().getDeclaredMethod("getNumProcessed");
+ long currentTaskCount =
(long)currentTaskCountMethod.invoke(metrics);
boolean aggregate =
uniqueName.startsWith("/" + name);
int pos = uniqueName.indexOf("/", 1);
if (pos > -1 && scaleout > 1 && name !=
null && aggregate) {
String st =
uniqueName.substring(pos);
uniqueName = "/" + name + st;
}
- PerformanceMetrics pm = new
PerformanceMetrics(name, uniqueName, analysisTime);
+ PerformanceMetrics pm = new
PerformanceMetrics(name, uniqueName, analysisTime, currentTaskCount);
casMetrics.add(pm);
}
} else {
@@ -323,7 +324,7 @@ public class UimaAsServiceProcessor exte
}
PerformanceMetrics pm = new PerformanceMetrics(
"Performance Metrics Not
Supported For DD Jobs and UIMA-AS <= v2.6.0",
- "Performance Metrics Not
Supported For DD Jobs and UIMA-AS <= v2.6.0 ", 0);
+ "Performance Metrics Not
Supported For DD Jobs and UIMA-AS <= v2.6.0 ", 0, 0);
casMetrics.add(pm);
}
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java?rev=1842140&r1=1842139&r2=1842140&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/UimaServiceProcessor.java
Thu Sep 27 18:46:20 2018
@@ -216,7 +216,7 @@ public class UimaServiceProcessor extend
CAS cas = casPool.getCas();
IProcessResult result;
-
+ logger.log(Level.INFO,this.getClass().getName(),"????????????
in process() ???????");
try {
// DUCC JP services are given a serialized CAS ... others
just the doc-text for a CAS
if (serviceConfiguration.getJpType() != null) {
@@ -236,6 +236,7 @@ public class UimaServiceProcessor extend
// PROCESS
// *****************************************************
ae.process(cas);
+ System.out.println("???????????? AFTER process()
???????");
// *****************************************************
// No exception in process() , fetch metrics
@@ -246,9 +247,10 @@ public class UimaServiceProcessor extend
// get the delta
List<PerformanceMetrics> casMetrics =
UimaMetricsGenerator.getDelta(
afterAnalysis, beforeAnalysis);
-
+ //System.out.println("---------- Performance Metrics
List Size:"+casMetrics.size());
successCount.incrementAndGet();
errorCountSinceLastSuccess.set(0);
+ //System.out.println("---------- Serialized Metrics
>>>>>"+resultSerializer.serialize(casMetrics));
return new
UimaProcessResult(resultSerializer.serialize(casMetrics));
} catch( Exception e ) {
logger.log(Level.WARNING,"",e);
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/PerformanceMetrics.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/PerformanceMetrics.java?rev=1842140&r1=1842139&r2=1842140&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/PerformanceMetrics.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/PerformanceMetrics.java
Thu Sep 27 18:46:20 2018
@@ -24,15 +24,17 @@ public class PerformanceMetrics {
private String name;
private String uniqueName;
private long analysisTime;
-
+ private long numberOfTasksProcessed;;
+
/**
* Creates a performance metrics instance
*
*/
- public PerformanceMetrics(String name, String uimaContextPath, long
analysisTime) {
+ public PerformanceMetrics(String name, String uimaContextPath, long
analysisTime, long taskCount) {
this.name = name;
this.uniqueName = uimaContextPath;
this.analysisTime = analysisTime;
+ this.numberOfTasksProcessed = taskCount;
}
/**
@@ -70,4 +72,12 @@ public class PerformanceMetrics {
return analysisTime;
}
+ /**
+ * Gets how many tasks have been processed so far
+ *
+ * @return number of tasks processed so far
+ */
+ public long getNumberOfTasksProcessed() {
+ return numberOfTasksProcessed;
+ }
}
Modified:
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java?rev=1842140&r1=1842139&r2=1842140&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-pullservice/src/main/java/org/apache/uima/ducc/ps/service/processor/uima/utils/UimaMetricsGenerator.java
Thu Sep 27 18:46:20 2018
@@ -204,7 +204,7 @@ public class UimaMetricsGenerator {
}
*/
return new PerformanceMetrics(aem.getName(),
- uimaFullyQualifiedAEContext,
aem.getAnalysisTime());
+ uimaFullyQualifiedAEContext,
aem.getAnalysisTime(), aem.getNumberOfCASesProcessed());
}
@@ -228,7 +228,8 @@ public class UimaMetricsGenerator {
}
PerformanceMetrics metrics = new
PerformanceMetrics(
after.getName(),
uniqueName,
- after.getAnalysisTime()
- before.getAnalysisTime());
+ after.getAnalysisTime()
- before.getAnalysisTime(),
+
after.getNumberOfTasksProcessed() - before.getNumberOfTasksProcessed());
performanceList.add(metrics);
break;
}
Modified:
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java?rev=1842140&r1=1842139&r2=1842140&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/HttpWorkerThread.java
Thu Sep 27 18:46:20 2018
@@ -317,7 +317,7 @@ public class HttpWorkerThread implements
List<PerformanceMetrics> pmList = new ArrayList<PerformanceMetrics>();
for( Properties p :
metrics) {
PerformanceMetrics pm =
-
new PerformanceMetrics(p.getProperty("name"), p.getProperty("uniqueName"),
Long.parseLong(p.getProperty("analysisTime")));
+
new PerformanceMetrics(p.getProperty("name"), p.getProperty("uniqueName"),
Long.parseLong(p.getProperty("analysisTime")),0);
pmList.add(pm);
}
