[jboss-cvs] JBossAS SVN: r90019 - projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer.

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

Author: ALRubinger
Date: 2009-06-09 19:51:32 -0400 (Tue, 09 Jun 2009)
New Revision: 90019

Modified:
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java
   projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedStatefulInvocationStatisticsWrapper.java
Log:
[EJBTHREE-1839] Give invocation metrics the same component subtype as instance metrics

Modified: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java	2009-06-09 23:45:11 UTC (rev 90018)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java	2009-06-09 23:51:32 UTC (rev 90019)
@@ -181,12 +181,9 @@
                {
                   throw new IllegalStateException("Invocation statistics was null");
                }
-               final ManagedInvocationStatisticsSessionWrapperBase wrapper = new ManagedInvocationStatisticsSessionWrapperBase(stats);
 
-               // Add to beanFactories
+               // Define invocation metrics bean name
                final String invocationBeanName = ejbName + BEAN_NAME_METRICS_SUFFIX_INVOCATION;
-               this.attach(wrapper, invocationBeanName, beanFactories);
-               log.debug("Attached invocation stats for: " + invocationBeanName);
 
                // SLSB
                if (sessionContainer instanceof StatelessContainer)
@@ -194,13 +191,19 @@
                   // Cast
                   final StatelessContainer slsb = (StatelessContainer) sessionContainer;
 
-                  // Make new metrics
+                  // Make new instance metrics
                   final SessionInstanceMetrics metrics = new BasicStatelessSessionInstanceMetrics(slsb);
 
+                  // Make new invocation metrics
+                  final ManagedInvocationStatisticsSessionWrapperBase invocationMetrics = new ManagedStatelessInvocationStatisticsWrapper(
+                        stats);
+
                   // Add to beanFactories
                   final String beanName = ejbName + BEAN_NAME_METRICS_SUFFIX_INSTANCE;
                   this.attach(metrics, beanName, beanFactories);
                   log.debug("Attached metrics stats for: " + beanName);
+                  this.attach(invocationMetrics, invocationBeanName, beanFactories);
+                  log.debug("Attached invocation stats for: " + invocationBeanName);
                }
 
                // SFSB
@@ -212,10 +215,16 @@
                   // Make new metrics
                   final SessionInstanceMetrics metrics = new BasicStatefulSessionInstanceMetrics(sfsb);
 
+                  // Make new invocation metrics
+                  final ManagedInvocationStatisticsSessionWrapperBase invocationMetrics = new ManagedStatefulInvocationStatisticsWrapper(
+                        stats);
+
                   // Add to beanFactories
                   final String beanName = ejbName + BEAN_NAME_METRICS_SUFFIX_INSTANCE;
                   this.attach(metrics, beanName, beanFactories);
                   log.debug("Attached metrics stats for: " + beanName);
+                  this.attach(invocationMetrics, invocationBeanName, beanFactories);
+                  log.debug("Attached invocation stats for: " + invocationBeanName);
                }
 
             }
@@ -293,6 +302,7 @@
       bmd.setConstructor(cmd);
       // Add to beanFactories
       beanFactories.add(bmd);
+      log.info("Attaching MC Bean: " + beanName);
    }
 
 }

Modified: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedStatefulInvocationStatisticsWrapper.java
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedStatefulInvocationStatisticsWrapper.java	2009-06-09 23:45:11 UTC (rev 90018)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedStatefulInvocationStatisticsWrapper.java	2009-06-09 23:51:32 UTC (rev 90019)
@@ -34,7 +34,7 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
- at ManagementObject(isRuntime = true, properties = ManagementProperties.EXPLICIT, description = "Stateless Session Bean Invocation Metrics", componentType = @ManagementComponent(type = "EJB3", subtype = "SFSB"))
+ at ManagementObject(isRuntime = true, properties = ManagementProperties.EXPLICIT, description = "Stateful Session Bean Invocation Metrics", componentType = @ManagementComponent(type = "EJB3", subtype = "SFSB"))
 public class ManagedStatefulInvocationStatisticsWrapper extends ManagedInvocationStatisticsSessionWrapperBase
 {