[jboss-cvs] JBossAS SVN: r89532 - in projects/ejb3/trunk/metrics-deployer: src/main/java/org/jboss/ejb3/metrics/deployer and 1 other directory.

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

Author: ALRubinger
Date: 2009-05-29 10:46:36 -0400 (Fri, 29 May 2009)
New Revision: 89532

Modified:
   projects/ejb3/trunk/metrics-deployer/pom.xml
   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/ManagedInvocationStatisticsWrapper.java
Log:
[EJBTHREE-1839] Add some logging, correct the dep chain for metrics-deployer

Modified: projects/ejb3/trunk/metrics-deployer/pom.xml
===================================================================
--- projects/ejb3/trunk/metrics-deployer/pom.xml	2009-05-29 14:41:08 UTC (rev 89531)
+++ projects/ejb3/trunk/metrics-deployer/pom.xml	2009-05-29 14:46:36 UTC (rev 89532)
@@ -34,45 +34,53 @@
     <!-- Versioning -->
     <version.org.jboss.deployers.jboss_deployers_spi>2.0.0.CR2</version.org.jboss.deployers.jboss_deployers_spi>
     <version.org.jboss.ejb3_jboss.ejb3.core>1.1.7-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.core>
+    <version.org.jboss.ejb3_jboss.ejb3.metrics.spi>0.1.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.metrics.spi>
     <version.org.jboss.man_jboss.managed>2.1.0.SP1</version.org.jboss.man_jboss.managed>
     <version.org.jboss.microcontainer_jboss.jmx.mc.int>2.2.0.M2</version.org.jboss.microcontainer_jboss.jmx.mc.int>
   
   </properties>
 
   <dependencies>
-  
+
     <!-- 
     Dependencies: org.jboss.ejb3 
     -->
-    
+
     <dependency>
       <groupId>org.jboss.ejb3</groupId>
       <artifactId>jboss-ejb3-core</artifactId>
       <version>${version.org.jboss.ejb3_jboss.ejb3.core}</version>
     </dependency>
-    
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-metrics-spi</artifactId>
+      <version>${version.org.jboss.ejb3_jboss.ejb3.metrics.spi}</version>
+    </dependency>
+
+
     <!-- 
     Dependencies: External to EJB3 
     -->
-    
+
     <dependency>
       <groupId>org.jboss.deployers</groupId>
       <artifactId>jboss-deployers-spi</artifactId>
       <version>${version.org.jboss.deployers.jboss_deployers_spi}</version>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.man</groupId>
       <artifactId>jboss-managed</artifactId>
       <version>${version.org.jboss.man_jboss.managed}</version>
     </dependency>
-    
+
     <!-- For compilation -->
     <dependency>
       <groupId>org.jboss.microcontainer</groupId>
       <artifactId>jboss-jmx-mc-int</artifactId>
       <version>${version.org.jboss.microcontainer_jboss.jmx.mc.int}</version>
     </dependency>
-    
+
   </dependencies>
 </project>

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-05-29 14:41:08 UTC (rev 89531)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/Ejb3MetricsDeployer.java	2009-05-29 14:46:36 UTC (rev 89532)
@@ -155,6 +155,7 @@
                // Attach to the DU
                final String invocationBeanName = sessionContainer.getName() + BEAN_NAME_METRICS_SUFFIX_INVOCATION;
                this.attach(wrapper, invocationBeanName, du);
+               log.debug("Attached invocation stats for :" + invocationBeanName);
 
                // SLSB
                if (sessionContainer instanceof StatelessContainer)
@@ -168,6 +169,7 @@
                   // Attach to the DU
                   final String beanName = slsb.getName() + BEAN_NAME_METRICS_SUFFIX_INSTANCE;
                   this.attach(metrics, beanName, du);
+                  log.debug("Attached metrics stats for :" + beanName);
                }
 
                // SFSB
@@ -182,6 +184,7 @@
                   // Attach to the DU
                   final String beanName = sfsb.getName() + BEAN_NAME_METRICS_SUFFIX_INSTANCE;
                   this.attach(metrics, beanName, du);
+                  log.debug("Attached metrics stats for :" + beanName);
                }
 
             }
@@ -223,7 +226,7 @@
       final BeanMetaData bean = bmdb.getBeanMetaData();
 
       // Add the attachment
-      du.addAttachment(BeanMetaData.class, bean);
+      du.addAttachment(beanName, bean, BeanMetaData.class);
       if (log.isTraceEnabled())
       {
          log.trace("Added metrics attachment to " + du + ": " + bean);

Modified: projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedInvocationStatisticsWrapper.java
===================================================================
--- projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedInvocationStatisticsWrapper.java	2009-05-29 14:41:08 UTC (rev 89531)
+++ projects/ejb3/trunk/metrics-deployer/src/main/java/org/jboss/ejb3/metrics/deployer/ManagedInvocationStatisticsWrapper.java	2009-05-29 14:46:36 UTC (rev 89532)
@@ -39,7 +39,7 @@
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $
  */
- at ManagementObject(isRuntime = true, properties = ManagementProperties.EXPLICIT, description = "Stateful Session Bean Instance Metrics", componentType = @ManagementComponent(type = "MCBean", subtype = "*"))
+ at ManagementObject(isRuntime = true, properties = ManagementProperties.EXPLICIT, description = "Session Bean Invocation Metrics", componentType = @ManagementComponent(type = "MCBean", subtype = "*"))
 public class ManagedInvocationStatisticsWrapper
 {
    // --------------------------------------------------------------------------------||