usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [20/50] incubator-usergrid git commit: remove yammer
Date Mon, 16 Mar 2015 23:37:48 GMT
remove yammer


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/62635942
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/62635942
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/62635942

Branch: refs/heads/two-dot-o
Commit: 626359421e9cfedf0fd5baba767051d37b7a24ab
Parents: 89f558a
Author: Shawn Feldman <sfeldman@apache.org>
Authored: Wed Mar 11 11:35:12 2015 -0600
Committer: Shawn Feldman <sfeldman@apache.org>
Committed: Wed Mar 11 11:35:12 2015 -0600

----------------------------------------------------------------------
 stack/core/pom.xml                              | 10 ----
 .../batch/service/JobSchedulerService.java      |  5 --
 .../corepersistence/CpEntityManager.java        |  3 -
 .../corepersistence/CpEntityManagerFactory.java |  4 --
 .../corepersistence/CpRelationManager.java      | 14 -----
 .../persistence/EntityManagerFactory.java       |  2 -
 .../cassandra/EntityManagerFactoryImpl.java     |  3 -
 .../cassandra/EntityManagerImpl.java            | 23 +-------
 .../cassandra/RelationManagerImpl.java          | 58 +++-----------------
 .../cassandra/index/ConnectedIndexScanner.java  |  2 -
 .../cassandra/index/IndexBucketScanner.java     |  2 -
 stack/pom.xml                                   | 43 ---------------
 stack/rest/pom.xml                              |  4 --
 .../org/apache/usergrid/rest/RootResource.java  |  6 --
 stack/test-utils/pom.xml                        |  5 --
 15 files changed, 10 insertions(+), 174 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index d30bedb..3a40366 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -279,16 +279,6 @@
     </dependency>
 
     <dependency>
-      <groupId>com.yammer.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>com.yammer.metrics</groupId>
-      <artifactId>metrics-annotation</artifactId>
-    </dependency>
-
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java b/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
index 5d57ab7..3674383 100644
--- a/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
+++ b/stack/core/src/main/java/org/apache/usergrid/batch/service/JobSchedulerService.java
@@ -46,8 +46,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
-import com.yammer.metrics.annotation.ExceptionMetered;
-import com.yammer.metrics.annotation.Timed;
 
 
 /**
@@ -81,8 +79,6 @@ public class JobSchedulerService extends AbstractScheduledService {
     public JobSchedulerService() { }
 
 
-    @Timed( name = "BulkJobScheduledService_runOneIteration", group = "scheduler", durationUnit = TimeUnit.MILLISECONDS,
-            rateUnit = TimeUnit.MINUTES )
     @Override
     protected void runOneIteration() throws Exception {
 
@@ -143,7 +139,6 @@ public class JobSchedulerService extends AbstractScheduledService {
     /**
      * Use the provided BulkJobFactory to build and submit BulkJob items as ListenableFuture objects
      */
-    @ExceptionMetered( name = "BulkJobScheduledService_submitWork_exceptions", group = "scheduler" )
     private void submitWork( final JobDescriptor jobDescriptor ) {
         final Job job;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 26eff4c..d808ae5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -108,7 +108,6 @@ import org.apache.usergrid.utils.UUIDUtils;
 import com.codahale.metrics.Timer;
 import com.google.common.base.Preconditions;
 import com.netflix.hystrix.exception.HystrixRuntimeException;
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.beans.ColumnSlice;
@@ -388,7 +387,6 @@ public class CpEntityManager implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_create" )
     @TraceParticipant
     public <A extends Entity> A create( String entityType, Class<A> entityClass,
             Map<String, Object> properties, UUID importId ) throws Exception {
@@ -1261,7 +1259,6 @@ public class CpEntityManager implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_getDictionaryElementValues" )
     public Map<String, Object> getDictionaryElementValues( EntityRef entity, String dictionaryName,
                                                            String... elementNames ) throws Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 12504ed..fe4d828 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@ -21,7 +21,6 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.yammer.metrics.annotation.Metered;
 import static java.lang.String.CASE_INSENSITIVE_ORDER;
 
 import java.util.*;
@@ -391,20 +390,17 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
 
 
     @Override
-    @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public Map<String, UUID> getApplications() throws Exception {
         return getApplications( false );
     }
 
 
     @Override
-    @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public Map<String, UUID> getDeletedApplications() throws Exception {
         return getApplications( true );
     }
 
 
-    @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public Map<String, UUID> getApplications(boolean deleted) throws Exception {
 
         Map<String, UUID> appMap = new HashMap<String, UUID>();

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index d018324..ee81a67 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -108,7 +108,6 @@ import org.apache.usergrid.utils.UUIDUtils;
 
 import com.codahale.metrics.Timer;
 import com.google.common.base.Preconditions;
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.beans.DynamicComposite;
@@ -490,7 +489,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @SuppressWarnings( "unchecked" )
-    @Metered( group = "core", name = "RelationManager_isOwner" )
     @Override
     public boolean isCollectionMember( String collName, EntityRef entity ) throws Exception {
 
@@ -742,7 +740,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @Override
-    @Metered( group = "core", name = "RelationManager_createItemInCollection" )
     public Entity createItemInCollection(
         String collName, String itemType, Map<String, Object> properties) throws Exception {
 
@@ -1012,7 +1009,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @Override
-    @Metered( group = "core", name = "RelationManager_createConnection_connection_ref" )
     public ConnectionRef createConnection( ConnectionRef connection ) throws Exception {
 
         return createConnection( connection.getConnectionType(), connection.getConnectedEntity() );
@@ -1020,7 +1016,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @Override
-    @Metered( group = "core", name = "RelationManager_createConnection_connectionType" )
     public ConnectionRef createConnection( String connectionType, EntityRef connectedEntityRef ) throws Exception {
 
         headEntity = em.validate( headEntity );
@@ -1091,7 +1086,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @SuppressWarnings( "unchecked" )
-    @Metered( group = "core", name = "CpRelationManager_batchUpdateEntityConnection" )
     public Mutator<ByteBuffer> batchUpdateEntityConnection(
             Mutator<ByteBuffer> batch,
             boolean disconnect,
@@ -1200,7 +1194,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @Override
-    @Metered( group = "core", name = "RelationManager_createConnection_paired_connection_type" )
     public ConnectionRef createConnection(
             String pairedConnectionType,
             EntityRef pairedEntity,
@@ -1212,7 +1205,6 @@ public class CpRelationManager implements RelationManager {
 
 
     @Override
-    @Metered( group = "core", name = "RelationManager_createConnection_connected_entity_ref" )
     public ConnectionRef createConnection( ConnectedEntityRef... connections ) throws Exception {
 
         throw new UnsupportedOperationException( "Paired connections not supported" );
@@ -1680,7 +1672,6 @@ public class CpRelationManager implements RelationManager {
      * @return The indexUpdate with batch mutations
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "RelationManager_batchUpdateCollectionIndex" )
     public IndexUpdate batchUpdateCollectionIndex(
             IndexUpdate indexUpdate, EntityRef owner, String collectionName )
             throws Exception {
@@ -1779,7 +1770,6 @@ public class CpRelationManager implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchStartIndexUpdate")
     public IndexUpdate batchStartIndexUpdate(
         Mutator<ByteBuffer> batch, Entity entity, String entryName,
         Object entryValue, UUID timestampUuid, boolean schemaHasProperty,
@@ -1939,7 +1929,6 @@ public class CpRelationManager implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateBackwardConnectionsDictionaryIndexes")
     public IndexUpdate batchUpdateBackwardConnectionsDictionaryIndexes(
             IndexUpdate indexUpdate ) throws Exception {
 
@@ -2006,7 +1995,6 @@ public class CpRelationManager implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateConnectionIndex")
     public IndexUpdate batchUpdateConnectionIndex(
             IndexUpdate indexUpdate, ConnectionRefImpl connection ) throws Exception {
 
@@ -2135,7 +2123,6 @@ public class CpRelationManager implements RelationManager {
     }
 
 
-    @Metered( group = "core", name = "RelationManager_batchDeleteConnectionIndexEntries" )
     public Mutator<ByteBuffer> batchDeleteConnectionIndexEntries(
             IndexUpdate indexUpdate,
             IndexUpdate.IndexEntry entry,
@@ -2190,7 +2177,6 @@ public class CpRelationManager implements RelationManager {
     }
 
 
-    @Metered( group = "core", name = "RelationManager_batchAddConnectionIndexEntries" )
     public Mutator<ByteBuffer> batchAddConnectionIndexEntries( IndexUpdate indexUpdate, IndexUpdate.IndexEntry entry,
                                                                ConnectionRefImpl conn, UUID[] index_keys ) {
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
index 880fe89..6db05f5 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManagerFactory.java
@@ -20,7 +20,6 @@ package org.apache.usergrid.persistence;
 import java.util.Map;
 import java.util.UUID;
 
-import com.yammer.metrics.annotation.Metered;
 import org.apache.usergrid.persistence.core.util.Health;
 import org.apache.usergrid.persistence.index.EntityIndex;
 import org.springframework.context.ApplicationContext;
@@ -97,7 +96,6 @@ public interface EntityManagerFactory {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public abstract Map<String, UUID> getApplications() throws Exception;
 
     public Map<String, UUID> getDeletedApplications() throws Exception;

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
index af1eabc..a8c62d9 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImpl.java
@@ -40,7 +40,6 @@ import org.apache.commons.lang.StringUtils;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.beans.ColumnSlice;
@@ -274,7 +273,6 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
 
 
     @Override
-    @Metered(group = "core", name = "EntityManagerFactory_lookupApplication_byName")
     public UUID lookupApplication( String name ) throws Exception {
         name = name.toLowerCase();
         HColumn<String, ByteBuffer> column =
@@ -295,7 +293,6 @@ public class EntityManagerFactoryImpl implements EntityManagerFactory, Applicati
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "EntityManagerFactory_getApplication")
     public Application getApplication( String name ) throws Exception {
         name = name.toLowerCase();
         HColumn<String, ByteBuffer> column =

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
index be43920..7dcbca7 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/EntityManagerImpl.java
@@ -90,7 +90,6 @@ import org.apache.usergrid.utils.UUIDUtils;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.beans.ColumnSlice;
@@ -191,6 +190,7 @@ public class EntityManagerImpl implements EntityManager {
     public static final String APPLICATION_COLLECTION = "application.collection.";
     public static final String APPLICATION_ENTITIES = "application.entities";
     public static final long ONE_COUNT = 1L;
+
     @Resource
     private EntityManagerFactoryImpl emf;
     @Resource
@@ -505,7 +505,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @return True if this entity can safely "own" this property name and value unique combination
      */
-    @Metered( group = "core", name = "EntityManager_isPropertyValueUniqueForEntity" )
     public boolean isPropertyValueUniqueForEntity( UUID ownerEntityId, String entityType, String propertyName,
                                                    Object propertyValue ) throws Exception {
 
@@ -536,7 +535,6 @@ public class EntityManagerImpl implements EntityManager {
     /**
      * Return all UUIDs that have this unique value
      *
-     * @param ownerEntityId The entity id that owns this entity collection
      * @param collectionName The entity collection name
      * @param propertyName The name of the unique property
      * @param propertyValue The value of the unique property
@@ -623,7 +621,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getAlias_single" )
     public EntityRef getAlias( EntityRef ownerRef, String collectionType, String aliasValue )
             throws Exception {
 
@@ -658,7 +655,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getAlias_multi" )
     public Map<String, EntityRef> getAlias(
             EntityRef ownerRef, String collectionName, List<String> aliases ) throws Exception {
 
@@ -735,7 +731,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_create" )
     @TraceParticipant
     public <A extends Entity> A create(
             String entityType, Class<A> entityClass, Map<String, Object> properties,
@@ -754,7 +749,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @SuppressWarnings( "unchecked" )
-    @Metered( group = "core", name = "EntityManager_batchCreate" )
     public <A extends Entity> A batchCreate(
             Mutator<ByteBuffer> m, String entityType, Class<A> entityClass,
             Map<String, Object> properties, UUID importId, UUID timestampUuid )
@@ -975,7 +969,6 @@ public class EntityManagerImpl implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_insertEntity" )
     public void insertEntity( EntityRef entityRef ) throws Exception {
 
         String type = entityRef.getType();
@@ -1021,7 +1014,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_getEntityType" )
     public String getEntityType( UUID entityId ) throws Exception {
 
         HColumn<String, String> column =
@@ -1044,7 +1036,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_loadPartialEntity" )
     public DynamicEntity loadPartialEntity( UUID entityId, String... propertyNames ) throws Exception {
 
         List<HColumn<String, ByteBuffer>> results = null;
@@ -1133,7 +1124,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_getEntities" )
     public <A extends Entity> List<A> getEntities(
             Collection<UUID> entityIds, Class<A> entityClass ) throws Exception {
 
@@ -1192,7 +1182,6 @@ public class EntityManagerImpl implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_getPropertyNames" )
     public Set<String> getPropertyNames( EntityRef entity ) throws Exception {
 
         Set<String> propertyNames = new TreeSet<String>( CASE_INSENSITIVE_ORDER );
@@ -1215,7 +1204,6 @@ public class EntityManagerImpl implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_getDictionaryNames" )
     public Set<String> getDictionaryNames( EntityRef entity ) throws Exception {
 
         Set<String> dictionaryNames = new TreeSet<String>( CASE_INSENSITIVE_ORDER );
@@ -1239,7 +1227,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getDictionaryElementValue" )
     public Object getDictionaryElementValue( EntityRef entity, String dictionaryName, String elementName )
             throws Exception {
 
@@ -1280,7 +1267,6 @@ public class EntityManagerImpl implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_getDictionaryElementValues" )
     public Map<String, Object> getDictionaryElementValues( EntityRef entity, String dictionaryName,
                                                            String... elementNames ) throws Exception {
 
@@ -1342,7 +1328,6 @@ public class EntityManagerImpl implements EntityManager {
      * @throws Exception the exception
      */
     @Override
-    @Metered( group = "core", name = "EntityManager_getDictionaryAsMap" )
     public Map<Object, Object> getDictionaryAsMap( EntityRef entity, String dictionaryName ) throws Exception {
 
         entity = validate( entity );
@@ -1405,7 +1390,6 @@ public class EntityManagerImpl implements EntityManager {
      *
      * @throws Exception the exception
      */
-    @Metered( group = "core", name = "EntityManager_updateProperties" )
     public void updateProperties(
             UUID entityId, String type, Map<String, Object> properties ) throws Exception {
 
@@ -1423,7 +1407,6 @@ public class EntityManagerImpl implements EntityManager {
     }
 
 
-    @Metered( group = "core", name = "EntityManager_deleteEntity" )
     public void deleteEntity( UUID entityId, String type ) throws Exception {
 
         logger.info( "deleteEntity {} of application {}", entityId, applicationId );
@@ -1608,7 +1591,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getAggregateCounters" )
     public Results getAggregateCounters( UUID userId, UUID groupId, UUID queueId, String category,
             String counterName, CounterResolution resolution, long start, long finish, boolean pad ) {
 
@@ -1647,7 +1629,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getAggregateCounters_fromQueryObj" )
     public Results getAggregateCounters( Query query ) throws Exception {
         CounterResolution resolution = query.getResolution();
         if ( resolution == null ) {
@@ -1732,7 +1713,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_getEntityCounters" )
     public Map<String, Long> getEntityCounters( UUID entityId ) throws Exception {
 
         Map<String, Long> counters = new HashMap<String, Long>();
@@ -1755,7 +1735,6 @@ public class EntityManagerImpl implements EntityManager {
 
 
     @Override
-    @Metered( group = "core", name = "EntityManager_createApplicationCollection" )
     public void createApplicationCollection( String entityType ) throws Exception {
 
         Keyspace ko = cass.getApplicationKeyspace( applicationId );

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/RelationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/RelationManagerImpl.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/RelationManagerImpl.java
index be84176..c4634c4 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/RelationManagerImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/RelationManagerImpl.java
@@ -81,7 +81,6 @@ import org.apache.usergrid.utils.IndexUtils;
 import org.apache.usergrid.utils.MapUtils;
 
 import com.google.common.base.Preconditions;
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.Keyspace;
 import me.prettyprint.hector.api.beans.DynamicComposite;
@@ -210,7 +209,6 @@ public class RelationManagerImpl implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateCollectionIndex")
     public IndexUpdate batchUpdateCollectionIndex( IndexUpdate indexUpdate, EntityRef owner, String collectionName )
             throws Exception {
 
@@ -292,7 +290,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getCollectionIndexes")
     public Set<String> getCollectionIndexes( String collectionName ) throws Exception {
 
         // TODO TN, read all buckets here
@@ -391,7 +388,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @SuppressWarnings("unchecked")
-    @Metered(group = "core", name = "RelationManager_batchAddToCollections")
     public Mutator<ByteBuffer> batchAddToCollections( Mutator<ByteBuffer> batch, String ownerType, List<UUID> ownerIds,
                                                       String collectionName, Entity entity, UUID timestampUuid )
             throws Exception {
@@ -506,7 +502,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @SuppressWarnings("unchecked")
-    @Metered(group = "core", name = "RelationManager_batchRemoveFromCollection")
     public Mutator<ByteBuffer> batchRemoveFromCollection( Mutator<ByteBuffer> batch, String collectionName,
                                                           Entity entity, boolean force, UUID timestampUuid )
             throws Exception {
@@ -567,7 +562,7 @@ public class RelationManagerImpl implements RelationManager {
         if ( !headEntity.getType().equalsIgnoreCase( TYPE_APPLICATION ) && !Schema
                 .isAssociatedEntityType( entity.getType() ) ) {
 
-            CollectionRef cref = new SimpleCollectionRef( headEntity, collectionName, entity ); 
+            CollectionRef cref = new SimpleCollectionRef( headEntity, collectionName, entity );
             em.delete( new SimpleEntityRef( cref.getType(), cref.getUuid() ) );
         }
 
@@ -575,7 +570,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchDeleteConnectionIndexEntries")
     public Mutator<ByteBuffer> batchDeleteConnectionIndexEntries( IndexUpdate indexUpdate, IndexEntry entry,
                                                                   ConnectionRefImpl connection, UUID[] index_keys )
             throws Exception {
@@ -626,7 +620,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchAddConnectionIndexEntries")
     public Mutator<ByteBuffer> batchAddConnectionIndexEntries( IndexUpdate indexUpdate, IndexEntry entry,
                                                                ConnectionRefImpl connection, UUID[] index_keys ) {
 
@@ -687,7 +680,6 @@ public class RelationManagerImpl implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateConnectionIndex")
     public IndexUpdate batchUpdateConnectionIndex( IndexUpdate indexUpdate, ConnectionRefImpl connection )
             throws Exception {
 
@@ -733,7 +725,7 @@ public class RelationManagerImpl implements RelationManager {
       /*
        * addInsertToMutator(batch, EntityCF.SETS, key(connection_id,
        * Schema.INDEXES_SET), indexEntry.getKey(), null, false, timestamp); }
-       * 
+       *
        * addInsertToMutator(batch, EntityCF.SETS, key(connection_id,
        * Schema.INDEXES_SET), entryName, null, false, timestamp);
        */
@@ -775,7 +767,6 @@ public class RelationManagerImpl implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateBackwardConnectionsPropertyIndexes")
     public IndexUpdate batchUpdateBackwardConnectionsPropertyIndexes( IndexUpdate indexUpdate ) throws Exception {
 
         logger.debug( "batchUpdateBackwordConnectionsPropertyIndexes" );
@@ -851,7 +842,6 @@ public class RelationManagerImpl implements RelationManager {
      *
      * @throws Exception the exception
      */
-    @Metered(group = "core", name = "RelationManager_batchUpdateBackwardConnectionsDictionaryIndexes")
     public IndexUpdate batchUpdateBackwardConnectionsDictionaryIndexes( IndexUpdate indexUpdate ) throws Exception {
 
         logger.debug( "batchUpdateBackwardConnectionsListIndexes" );
@@ -869,13 +859,12 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @SuppressWarnings("unchecked")
-    @Metered(group = "core", name = "RelationManager_batchUpdateEntityConnection")
-    public Mutator<ByteBuffer> batchUpdateEntityConnection( Mutator<ByteBuffer> batch, 
+    public Mutator<ByteBuffer> batchUpdateEntityConnection( Mutator<ByteBuffer> batch,
         boolean disconnect, ConnectionRefImpl connection, UUID timestampUuid ) throws Exception {
 
         long timestamp = getTimestampInMicros( timestampUuid );
 
-        Entity connectedEntity = em.get( new SimpleEntityRef( 
+        Entity connectedEntity = em.get( new SimpleEntityRef(
                 connection.getConnectedEntityType(), connection.getConnectedEntityId()) );
 
         if ( connectedEntity == null ) {
@@ -1072,7 +1061,7 @@ public class RelationManagerImpl implements RelationManager {
 
         ConnectionRefImpl loopback = connection.getConnectionToConnectionEntity();
         if ( !disconnect ) {
-            em.insertEntity( new SimpleEntityRef( 
+            em.insertEntity( new SimpleEntityRef(
                     CONNECTION_ENTITY_CONNECTION_TYPE, loopback.getConnectedEntityId() ) );
         }
 
@@ -1082,7 +1071,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchDisconnect")
     public void batchDisconnect( Mutator<ByteBuffer> batch, UUID timestampUuid ) throws Exception {
 
 
@@ -1120,7 +1108,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchStartIndexUpdate")
     public IndexUpdate batchStartIndexUpdate( Mutator<ByteBuffer> batch, Entity entity, String entryName,
                                               Object entryValue, UUID timestampUuid, boolean schemaHasProperty,
                                               boolean isMultiValue, boolean removeListEntry, boolean fulltextIndexed,
@@ -1250,7 +1237,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchUpdatePropertyIndexes")
     public void batchUpdatePropertyIndexes( Mutator<ByteBuffer> batch, String propertyName, Object propertyValue,
                                             boolean entitySchemaHasProperty, boolean noRead, UUID timestampUuid )
             throws Exception {
@@ -1416,7 +1402,6 @@ public class RelationManagerImpl implements RelationManager {
 
     @SuppressWarnings("unchecked")
     @Override
-    @Metered(group = "core", name = "RelationManager_isOwner")
     public boolean isCollectionMember( String collectionName, EntityRef entity ) throws Exception {
 
         Keyspace ko = cass.getApplicationKeyspace( applicationId );
@@ -1475,7 +1460,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getOwners")
     public Map<String, Map<UUID, Set<String>>> getOwners() throws Exception {
         Map<EntityRef, Set<String>> containerEntities = getContainingCollections();
         Map<String, Map<UUID, Set<String>>> owners = new LinkedHashMap<String, Map<UUID, Set<String>>>();
@@ -1492,7 +1476,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getCollections")
     public Set<String> getCollections() throws Exception {
 
         Map<String, CollectionInfo> collections = getDefaultSchema().getCollections( headEntity.getType() );
@@ -1505,7 +1488,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getCollection_start_result")
     public Results getCollection( String collectionName, UUID startResult, int count, Level resultsLevel,
                                   boolean reversed ) throws Exception {
         // changed intentionally to delegate to search so that behavior is
@@ -1524,7 +1506,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getCollecitonForQuery")
     public Results getCollection( String collectionName, Query query, Level resultsLevel ) throws Exception {
 
         // changed intentionally to delegate to search so that behavior is
@@ -1535,7 +1516,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_addToCollection")
     public Entity addToCollection( String collectionName, EntityRef itemRef ) throws Exception {
 
         Entity itemEntity = em.get( itemRef );
@@ -1566,7 +1546,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_addToCollections")
     public Entity addToCollections( List<EntityRef> owners, String collectionName ) throws Exception {
 
         Entity itemEntity = getHeadEntity();
@@ -1600,7 +1579,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_createItemInCollection")
     public Entity createItemInCollection( String collectionName, String itemType, Map<String, Object> properties )
             throws Exception {
 
@@ -1653,7 +1631,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_removeFromCollection")
     public void removeFromCollection( String collectionName, EntityRef itemRef ) throws Exception {
 
         if ( headEntity.getUuid().equals( applicationId ) ) {
@@ -1703,7 +1680,6 @@ public class RelationManagerImpl implements RelationManager {
     }
 
 
-    @Metered(group = "core", name = "RelationManager_batchRemoveFromContainers")
     public void batchRemoveFromContainers( Mutator<ByteBuffer> m, UUID timestampUuid ) throws Exception {
         Entity entity = getHeadEntity();
         // find all the containing collections
@@ -1720,7 +1696,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_copyRelationships")
     public void copyRelationships( String srcRelationName, EntityRef dstEntityRef, String dstRelationName )
             throws Exception {
 
@@ -1757,7 +1732,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_searchCollection")
     public Results searchCollection( String collectionName, Query query ) throws Exception {
 
         if ( query == null ) {
@@ -1782,7 +1756,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_createConnection_connection_ref")
     public ConnectionRef createConnection( ConnectionRef connection ) throws Exception {
         ConnectionRefImpl connectionImpl = new ConnectionRefImpl( connection );
 
@@ -1793,7 +1766,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_createConnection_connectionType")
     public ConnectionRef createConnection( String connectionType, EntityRef connectedEntityRef ) throws Exception {
 
         headEntity = em.validate( headEntity );
@@ -1808,7 +1780,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_createConnection_paired_connection_type")
     public ConnectionRef createConnection( String pairedConnectionType, EntityRef pairedEntity, String connectionType,
                                            EntityRef connectedEntityRef ) throws Exception {
 
@@ -1823,7 +1794,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_createConnection_connected_entity_ref")
     public ConnectionRef createConnection( ConnectedEntityRef... connections ) throws Exception {
 
         ConnectionRefImpl connection = new ConnectionRefImpl( headEntity, connections );
@@ -1835,7 +1805,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_connectionRef_type_entity")
     public ConnectionRef connectionRef( String connectionType, EntityRef connectedEntityRef ) throws Exception {
 
         ConnectionRef connection = new ConnectionRefImpl( headEntity, connectionType, connectedEntityRef );
@@ -1845,7 +1814,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_connectionRef_entity_to_entity")
     public ConnectionRef connectionRef( String pairedConnectionType, EntityRef pairedEntity, String connectionType,
                                         EntityRef connectedEntityRef ) throws Exception {
 
@@ -1858,7 +1826,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_connectionRef_connections")
     public ConnectionRef connectionRef( ConnectedEntityRef... connections ) {
 
         ConnectionRef connection = new ConnectionRefImpl( headEntity, connections );
@@ -1868,14 +1835,12 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_deleteConnection")
     public void deleteConnection( ConnectionRef connectionRef ) throws Exception {
         updateEntityConnection( true, new ConnectionRefImpl( connectionRef ) );
     }
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getConnectionTypes_entity_id")
     public Set<String> getConnectionTypes( UUID connectedEntityId ) throws Exception {
         // Add connection type to connections set
         //    addInsertToMutator(batch, ENTITY_DICTIONARIES,
@@ -1923,7 +1888,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getConnectionTypes")
     public Set<String> getConnectionTypes( boolean filterConnection ) throws Exception {
         Set<String> connections = cast( em.getDictionaryAsSet( headEntity, Schema.DICTIONARY_CONNECTED_TYPES ) );
         if ( connections == null ) {
@@ -1937,7 +1901,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getConnectedEntities")
     public Results getConnectedEntities( String connectionType, String connectedEntityType, Level resultsLevel )
             throws Exception {
 
@@ -1976,7 +1939,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getConnectingEntities")
     public Results getConnectingEntities( String connectionType, String connectedEntityType,
                                           Level resultsLevel ) throws Exception {
 
@@ -1985,7 +1947,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_getConnectingEntities")
     public Results getConnectingEntities(String connectionType,
     		String entityType, Level level, int count) throws Exception {
 		return getConnectingEntities(headEntity, connectionType, entityType, level, count );
@@ -2032,7 +1993,6 @@ public class RelationManagerImpl implements RelationManager {
 
 
     @Override
-    @Metered(group = "core", name = "RelationManager_searchConnectedEntities")
     public Results searchConnectedEntities( Query query ) throws Exception {
 
         Preconditions.checkNotNull(query, "Query must not be null");
@@ -2143,7 +2103,7 @@ public class RelationManagerImpl implements RelationManager {
 
         /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.usergrid.persistence.query.ir.NodeVisitor#visit(org.apache.usergrid.
      * persistence.query.ir.WithinNode)
      */
@@ -2165,7 +2125,7 @@ public class RelationManagerImpl implements RelationManager {
 
         @Override
         public void visit( NameIdentifierNode nameIdentifierNode ) throws Exception {
-            EntityRef ref = em.getAlias( 
+            EntityRef ref = em.getAlias(
                     headEntity, collection.getType(), nameIdentifierNode.getName() );
 
             if ( ref == null ) {
@@ -2236,7 +2196,7 @@ public class RelationManagerImpl implements RelationManager {
 
         /*
      * (non-Javadoc)
-     * 
+     *
      * @see org.apache.usergrid.persistence.query.ir.NodeVisitor#visit(org.apache.usergrid.
      * persistence.query.ir.WithinNode)
      */
@@ -2324,7 +2284,7 @@ public class RelationManagerImpl implements RelationManager {
         @Override
         public void visit( NameIdentifierNode nameIdentifierNode ) throws Exception {
             //TODO T.N. USERGRID-1919 actually validate this is connected
-            EntityRef ref = em.getAlias( new SimpleEntityRef(Application.ENTITY_TYPE, applicationId), 
+            EntityRef ref = em.getAlias( new SimpleEntityRef(Application.ENTITY_TYPE, applicationId),
                     connection.getConnectedEntityType(), nameIdentifierNode.getName() );
 
             if ( ref == null ) {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
index b412df8..ed705b6 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/ConnectedIndexScanner.java
@@ -27,7 +27,6 @@ import java.util.UUID;
 import org.springframework.util.Assert;
 import org.apache.usergrid.persistence.cassandra.CassandraService;
 
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.beans.HColumn;
 
@@ -249,7 +248,6 @@ public class ConnectedIndexScanner implements IndexScanner {
      * @see java.util.Iterator#next()
      */
     @Override
-    @Metered( group = "core", name = "IndexBucketScanner_load" )
     public Set<HColumn<ByteBuffer, ByteBuffer>> next() {
         Set<HColumn<ByteBuffer, ByteBuffer>> returnVal = lastResults;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/IndexBucketScanner.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/IndexBucketScanner.java b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/IndexBucketScanner.java
index b2ca591..56c651b 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/IndexBucketScanner.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/index/IndexBucketScanner.java
@@ -31,7 +31,6 @@ import org.apache.usergrid.persistence.IndexBucketLocator.IndexType;
 import org.apache.usergrid.persistence.cassandra.ApplicationCF;
 import org.apache.usergrid.persistence.cassandra.CassandraService;
 
-import com.yammer.metrics.annotation.Metered;
 
 import me.prettyprint.hector.api.beans.HColumn;
 
@@ -209,7 +208,6 @@ public class IndexBucketScanner implements IndexScanner {
      * @see java.util.Iterator#next()
      */
     @Override
-    @Metered(group = "core", name = "IndexBucketScanner_load")
     public NavigableSet<HColumn<ByteBuffer, ByteBuffer>> next() {
         NavigableSet<HColumn<ByteBuffer, ByteBuffer>> returnVal = lastResults;
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index 25b2258..ee3f9cd 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -109,7 +109,6 @@
       <jersey-version>1.18.1</jersey-version>
       <junit-version>4.12</junit-version>
       <log4j-version>1.2.16</log4j-version>
-      <metrics-version>2.1.2</metrics-version>
       <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
       <shiro-version>1.2.3</shiro-version>
       <slf4j-version>1.6.1</slf4j-version>
@@ -826,12 +825,6 @@
       </dependency>
 
       <dependency>
-        <groupId>com.yammer.metrics</groupId>
-        <artifactId>metrics-annotation</artifactId>
-        <version>${metrics-version}</version>
-      </dependency>
-
-      <dependency>
         <groupId>com.github.stephenc</groupId>
         <artifactId>jamm</artifactId>
         <version>0.2.5</version>
@@ -1072,44 +1065,8 @@
         <version>${snakeyaml-version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.yammer.metrics</groupId>
-        <artifactId>metrics-core</artifactId>
-        <version>${metrics-version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <dependency>
-        <groupId>com.yammer.metrics</groupId>
-        <artifactId>metrics-spring</artifactId>
-        <version>${metrics-version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-          </exclusion>
-
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-          </exclusion>
 
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-          </exclusion>
 
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
 
       <dependency>
         <groupId>jline</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 5a856de..deb11f8 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -259,10 +259,6 @@
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-spring</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.sun.jersey</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
index 27eff28..e4086f9 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/RootResource.java
@@ -55,8 +55,6 @@ import org.apache.shiro.authz.UnauthorizedException;
 import com.google.common.collect.BiMap;
 import com.sun.jersey.api.json.JSONWithPadding;
 import com.yammer.metrics.Metrics;
-import com.yammer.metrics.annotation.ExceptionMetered;
-import com.yammer.metrics.annotation.Timed;
 import com.yammer.metrics.core.Counter;
 import com.yammer.metrics.core.Gauge;
 import com.yammer.metrics.core.Histogram;
@@ -297,8 +295,6 @@ public class RootResource extends AbstractContextResource implements MetricProce
     public static final String ENTITY_ID_PATH = "{entityId: " + Identifier.UUID_REX + "}";
     public static final String EMAIL_PATH = "{email: " + Identifier.EMAIL_REX + "}";
 
-    @Timed(name = "getApplicationByUuids_timer", group = "rest_timers")
-    @ExceptionMetered(group = "rest_exceptions", name = "getApplicationByUuids_exceptions")
     @Path(ORGANIZATION_ID_PATH+"/"+APPLICATION_ID_PATH)
     public ApplicationResource getApplicationByUuids( @PathParam("organizationId") String organizationIdStr,
                                                       @PathParam("applicationId") String applicationIdStr )
@@ -324,8 +320,6 @@ public class RootResource extends AbstractContextResource implements MetricProce
     }
 
 
-    @Timed(name = "getOrganizationByName_timer", group = "rest_timers")
-    @ExceptionMetered(group = "rest_exceptions", name = "getOrganizationByName_exceptions")
     @Path("{organizationName}")
     public OrganizationResource getOrganizationByName( @PathParam("organizationName") String organizationName )
             throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62635942/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index fecf069..cf82373 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -149,11 +149,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.yammer.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>


Mime
View raw message