You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/07/24 17:22:07 UTC
[39/50] [abbrv] incubator-usergrid git commit: add invoke timer
add invoke timer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/11f8049b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/11f8049b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/11f8049b
Branch: refs/heads/USERGRID-869
Commit: 11f8049b660dc452a9ca9cec29a4d1bdc72d30b0
Parents: 75d59e7
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 22 08:37:27 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 22 08:37:27 2015 -0600
----------------------------------------------------------------------
.../usergrid/services/AbstractService.java | 62 ++++----------------
1 file changed, 13 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/11f8049b/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java b/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
index 660545e..1c04da9 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/AbstractService.java
@@ -28,7 +28,6 @@ import java.util.UUID;
import com.codahale.metrics.Timer;
import org.apache.usergrid.persistence.core.metrics.MetricsFactory;
-import org.apache.usergrid.persistence.core.metrics.ObservableTimer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
@@ -105,11 +104,7 @@ public abstract class AbstractService implements Service {
private Timer entityGetTimer;
private Timer entitiesGetTimer;
private Timer entitiesParallelGetTimer;
- private Timer deleteByNameTimer;
- private Timer postByNameTimer;
- private Timer putByNameTimer;
- private Timer getByNameTimer;
- private Timer headByNameTimer;
+ private Timer invokeTimer;
public AbstractService() {
@@ -127,11 +122,7 @@ public abstract class AbstractService implements Service {
this.entityGetTimer = metricsFactory.getTimer(this.getClass(), "importEntity.get");
this.entitiesGetTimer = metricsFactory.getTimer(this.getClass(), "importEntities.get");
this.entitiesParallelGetTimer = metricsFactory.getTimer( this.getClass(),"importEntitiesP.get" );
- this.getByNameTimer = metricsFactory.getTimer( this.getClass(),"byname.get" );
- this.putByNameTimer = metricsFactory.getTimer( this.getClass(),"byname.put" );
- this.postByNameTimer = metricsFactory.getTimer( this.getClass(),"byname.post" );
- this.deleteByNameTimer = metricsFactory.getTimer(this.getClass(), "byname.delete");
- this.headByNameTimer = metricsFactory.getTimer(this.getClass(), "byname.head");
+ this.invokeTimer = metricsFactory.getTimer( this.getClass(),"service.invoke" );
}
@@ -710,9 +701,8 @@ public abstract class AbstractService implements Service {
public ServiceResults invoke( ServiceContext context ) throws Exception {
-
ServiceResults results = null;
-
+ Timer.Context time = invokeTimer.time();
String metadataType = checkForServiceMetadata( context );
if ( metadataType != null ) {
return handleServiceMetadata( context, metadataType );
@@ -740,8 +730,9 @@ public abstract class AbstractService implements Service {
}
results = handleEntityDictionary( context, results, entityDictionary );
- results = handleEntityCommand( context, results, entityCommand );
+ results = handleEntityCommand(context, results, entityCommand);
+ time.stop();
return results;
}
@@ -770,47 +761,20 @@ public abstract class AbstractService implements Service {
public ServiceResults invokeItemWithName( ServiceContext context, String name ) throws Exception {
-
- Timer.Context time;
- switch ( context.getAction() ) {
+ switch (context.getAction()) {
case GET:
- time = getByNameTimer.time();
- try {
- return getItemByName(context, name);
- } finally {
- time.stop();
- }
+ return getItemByName(context, name);
case POST:
- time = postByNameTimer.time();
- try {
- return postItemByName(context, name);
- } finally {
- time.stop();
- }
+ return postItemByName(context, name);
case PUT:
- time = putByNameTimer.time();
- try {
- return putItemByName(context, name);
- } finally {
- time.stop();
- }
+ return putItemByName(context, name);
case DELETE:
- time = deleteByNameTimer.time();
- try {
- return deleteItemByName(context, name);
- } finally {
- time.stop();
- }
+ return deleteItemByName(context, name);
case HEAD:
- time = headByNameTimer.time();
- try {
- return headItemByName(context, name);
- } finally {
- time.stop();
- }
+ return headItemByName(context, name);
+ default:
+ throw new ServiceInvocationException(context, "Request action unhandled " + context.getAction());
}
-
- throw new ServiceInvocationException( context, "Request action unhandled " + context.getAction() );
}