[jboss-svn-commits] JBL Code SVN: r23677 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main: resources/META-INF and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2008-11-03 08:51:28 -0500 (Mon, 03 Nov 2008)
New Revision: 23677

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
Log:
JBESB-2123
Reflect the overall size of the message within the JON plugin.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-11-03 13:27:49 UTC (rev 23676)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/java/org/jbosson/plugins/jbossesb/ServiceComponent.java	2008-11-03 13:51:28 UTC (rev 23677)
@@ -43,10 +43,12 @@
     private static final String OVERALL_MESSAGE_METRIC = "overallMessageCount";
    
     private static final String OVERALL_BYTES_METRIC = "overallBytes";
+    private static final String OVERALL_BYTES_COUNT = "overall service count bytes";
+    
     private static final String OVERALL_BYTES_PROCESSED_METRIC = "bytesProcessed";
     private static final String OVERALL_BYTES_FAILED_METRIC = "bytesFailed";
     
-    private static final String OVERALL_BYTES_PROCESSED = "overall bytes processed";
+    private static final String OVERALL_BYTES_PROCESSED = "overall processedbytes";
     private static final String OVERALL_BYTES_FAILED = "overall bytes failed";
 
     private static final String OVERALL_MINUTE_METRIC_NAME = "overallMessageCountByMinute";
@@ -63,8 +65,8 @@
     	pluginConfig.put(new PropertySimple("type", "service"));
     	Integer overallMessages = new Integer(0);
     	
-    	int bytesProcessed = 0;
-    	int bytesFailed = 0;
+    	long bytesProcessed = 0;
+    	long bytesFailed = 0;
         for (MeasurementScheduleRequest request : requests) {
         	String metricName = request.getName();
         	if (metricName.equals(OVERALL_MESSAGE_METRIC)) {
@@ -73,20 +75,27 @@
         		report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
         	} else if (metricName.equals(OVERALL_BYTES_PROCESSED_METRIC)) {
         		EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_BYTES_PROCESSED);
-        		Integer processed = new Integer(0);
+        		Long processed = new Long(0);
         		if (attribute != null) {
-        			processed = (Integer) attribute.refresh();
-        			bytesProcessed = processed.intValue();
+        			processed = (Long) attribute.refresh();
+        			bytesProcessed = processed.longValue();
         		}
         		report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
         	} else if (metricName.equals(OVERALL_BYTES_FAILED_METRIC)) {
         		EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_BYTES_FAILED);
-        		Integer processed = new Integer(0);
+        		Long processed = new Long(0);
         		if (attribute != null) {
-        			processed = (Integer) attribute.refresh();
-        			bytesFailed = processed.intValue();
+        			processed = (Long) attribute.refresh();
+        			bytesFailed = processed.longValue();
         		}
         		report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));        		
+        	} else if (metricName.equals(OVERALL_BYTES_METRIC)) {
+        		EmsAttribute attribute = getEmsBean().getAttribute(OVERALL_BYTES_COUNT);
+        		Long processed = new Long(0);
+        		if (attribute != null) {
+        			processed = (Long) attribute.refresh();
+        		}
+        		report.addData(new MeasurementDataNumeric(request, new Double(processed.doubleValue())));
         	}
         }
 
@@ -94,8 +103,6 @@
         	String metricName = request.getName();
         	if (metricName.equals(OVERALL_MINUTE_METRIC_NAME)) {
         		report.addData(new MeasurementDataNumeric(request, new Double(overallMessages.doubleValue())));
-        	} else if (metricName.equals(OVERALL_BYTES_METRIC)) {
-        		report.addData(new MeasurementDataNumeric(request, new Double(bytesProcessed + bytesFailed)));
         	}
         }
     }

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2008-11-03 13:27:49 UTC (rev 23676)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/tools/jonplugin/src/main/resources/META-INF/rhq-plugin.xml	2008-11-03 13:51:28 UTC (rev 23677)
@@ -53,8 +53,7 @@
       <metric displayName="Message Count (Successful)" property="SuccessfulMessageCount" category="utilization" displayType="summary" measurementType="dynamic" description="Overall Successful Message Count"/>
       <metric displayName="Message Count (Total)" property="TotalMessageCount" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Total Message Count"/>
       <metric displayName="Message Counts (Failed)" property="FailedMessageCount" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Failed Message Count"/>
-      <metric displayName="Processed Bytes" property="ProcessedBytes" units="bytes" category="utilization" displayType="
-summary" defaultOn="true" measurementType="dynamic" description="Overall Bytes Processed"/>
+      <metric displayName="Processed Bytes" property="ProcessedBytes" units="bytes" category="utilization" displayType="summary" defaultOn="true" measurementType="dynamic" description="Overall Bytes Processed"/>
       <metric property="LastSuccessfulMessageDate" displayName="Last Successful Message Date" dataType="trait" displayType="summary" defaultOn="true" description="Last Successful Message Date"/>
       <metric property="LastFailedMessageDate" displayName="Last Failed Message Date" dataType="trait" displayType="summary" defaultOn="true" description="Last Failed Message Date"/>
       <content name="library" displayName="Jar Library" category="deployable"
@@ -189,4 +188,3 @@
     </service>
     </service>
 </plugin>
-