Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Uses latest fcrepo-snapshot build (3.0.0-RC1-SNAPSHOT) of metrics, wh…
…ich addresses

	https://github.com/codahale/metrics/issues/359
and, in turn,
	https://github.com/codahale/metrics/issues/334

Removes MetricsService from fcrepo-kernel in favor of RegistryService from
fcrepo-metrics (not sure why we had this duplication to begin with)
  • Loading branch information
Edwin Shin committed May 30, 2013
1 parent acfb0f2 commit 519f027
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 68 deletions.
Expand Up @@ -36,6 +36,8 @@
import org.slf4j.Logger;
import org.springframework.stereotype.Component;

import com.codahale.metrics.annotation.Timed;

@Component
@Path("/rest/{path: .*}/fcr:content")
public class FedoraContent extends AbstractResource {
Expand All @@ -49,6 +51,7 @@ public class FedoraContent extends AbstractResource {
* @throws RepositoryException
*/
@POST
@Timed
public Response create(
@PathParam("path") final List<PathSegment> pathList,
@QueryParam("checksumType") final String checksumType,
Expand Down Expand Up @@ -94,6 +97,7 @@ public Response create(
* @throws InvalidChecksumException
*/
@PUT
@Timed
public Response modifyContent(
@PathParam("path") List<PathSegment> pathList,
@HeaderParam("Content-Type") final MediaType requestContentType,
Expand Down Expand Up @@ -131,6 +135,7 @@ public Response modifyContent(
* @throws RepositoryException
*/
@GET
@Timed
public Response getContent(
@PathParam("path") List<PathSegment> pathList,
@Context final Request request
Expand Down
6 changes: 3 additions & 3 deletions fcrepo-kernel/src/main/java/org/fcrepo/Datastream.java
Expand Up @@ -2,7 +2,7 @@
package org.fcrepo;

import static com.codahale.metrics.MetricRegistry.name;
import static org.fcrepo.services.MetricsService.metrics;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.fcrepo.services.ServiceHelpers.getNodePropertySize;
import static org.fcrepo.utils.FedoraTypesUtils.getBinary;
import static org.fcrepo.utils.FedoraTypesUtils.isFedoraDatastream;
Expand Down Expand Up @@ -41,8 +41,8 @@ public class Datastream extends FedoraResource implements FedoraJcrTypes {

private static final Logger LOGGER = getLogger(Datastream.class);

static final Histogram contentSizeHistogram = metrics.histogram(name(
Datastream.class, "content-size"));
static final Histogram contentSizeHistogram = getMetrics().histogram(
name(Datastream.class, "content-size"));

/**
* The JCR node for this datastream
Expand Down
Expand Up @@ -3,7 +3,7 @@

import static com.codahale.metrics.MetricRegistry.name;
import static java.util.UUID.randomUUID;
import static org.fcrepo.services.MetricsService.metrics;
import static org.fcrepo.metrics.RegistryService.getMetrics;

import com.codahale.metrics.Timer;

Expand All @@ -15,7 +15,8 @@
*/
public class UUIDPidMinter extends BasePidMinter {

static final Timer timer = metrics.timer(name(UUIDPidMinter.class, "mint"));
static final Timer timer = getMetrics().timer(
name(UUIDPidMinter.class, "mint"));

/**
* Mint a unique identifier as a UUID
Expand All @@ -32,5 +33,4 @@ public String mintPid() {
context.stop();
}
}

}
Expand Up @@ -9,7 +9,7 @@
import static javax.jcr.observation.Event.PROPERTY_ADDED;
import static javax.jcr.observation.Event.PROPERTY_CHANGED;
import static javax.jcr.observation.Event.PROPERTY_REMOVED;
import static org.fcrepo.services.MetricsService.metrics;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.slf4j.LoggerFactory.getLogger;

import javax.annotation.PostConstruct;
Expand Down Expand Up @@ -41,7 +41,8 @@ public class SimpleObserver implements EventListener {
/**
* A simple counter of events that pass through this observer
*/
static final Counter EVENT_COUNTER = metrics.counter(name(
static final Counter EVENT_COUNTER = getMetrics().counter(
name(
SimpleObserver.class, "onEvent"));

static final Integer EVENT_TYPES = NODE_ADDED + NODE_REMOVED + NODE_MOVED +
Expand Down
Expand Up @@ -5,8 +5,8 @@
import static com.google.common.collect.ImmutableSet.copyOf;
import static com.google.common.collect.Sets.difference;
import static java.security.MessageDigest.getInstance;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.slf4j.LoggerFactory.getLogger;
import static org.fcrepo.services.MetricsService.metrics;

import java.io.IOException;
import java.io.InputStream;
Expand All @@ -20,14 +20,6 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;

import com.codahale.metrics.Counter;
import com.codahale.metrics.Timer;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.update.GraphStoreFactory;
import org.fcrepo.Datastream;
import org.fcrepo.binary.PolicyDecisionPoint;
import org.fcrepo.exception.InvalidChecksumException;
Expand All @@ -40,6 +32,15 @@
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;

import com.codahale.metrics.Counter;
import com.codahale.metrics.Timer;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableSet;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.update.GraphStoreFactory;

/**
* Service for creating and retrieving Datastreams without using the JCR API.
*
Expand All @@ -54,16 +55,20 @@ public class DatastreamService extends RepositoryService {
@Autowired
private LowLevelStorageService llStoreService;

static final Counter fixityCheckCounter = metrics.counter(name(
static final Counter fixityCheckCounter = getMetrics().counter(
name(
LowLevelStorageService.class, "fixity-check-counter"));

static final Timer timer = metrics.timer(name(Datastream.class,
static final Timer timer = getMetrics().timer(
name(Datastream.class,
"fixity-check-time"));

static final Counter fixityRepairedCounter = metrics.counter(name(
static final Counter fixityRepairedCounter = getMetrics().counter(
name(
LowLevelStorageService.class, "fixity-repaired-counter"));

static final Counter fixityErrorCounter = metrics.counter(name(
static final Counter fixityErrorCounter = getMetrics().counter(
name(
LowLevelStorageService.class, "fixity-error-counter"));


Expand Down

This file was deleted.

Expand Up @@ -3,6 +3,7 @@

import static com.codahale.metrics.MetricRegistry.name;
import static com.google.common.base.Throwables.propagate;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.slf4j.LoggerFactory.getLogger;

import java.util.HashMap;
Expand Down Expand Up @@ -42,8 +43,8 @@ public class RepositoryService extends JcrTools implements FedoraJcrTypes {
private static final Logger logger = getLogger(RepositoryService.class);


private final Timer objectSizeCalculationTimer = MetricsService.getMetrics().timer(name(
RepositoryService.class, "objectSizeCalculation"));
private final Timer objectSizeCalculationTimer = getMetrics().timer(
name(RepositoryService.class, "objectSizeCalculation"));

@Inject
protected Repository repo;
Expand Down
6 changes: 2 additions & 4 deletions fcrepo-kernel/src/main/java/org/fcrepo/utils/JcrRdfTools.java
Expand Up @@ -11,6 +11,7 @@
import static javax.jcr.PropertyType.REFERENCE;
import static javax.jcr.PropertyType.URI;
import static javax.jcr.PropertyType.WEAKREFERENCE;
import static org.fcrepo.metrics.RegistryService.getMetrics;
import static org.fcrepo.utils.FedoraTypesUtils.getNodeTypeManager;
import static org.fcrepo.utils.FedoraTypesUtils.getPredicateForProperty;
import static org.fcrepo.utils.FedoraTypesUtils.getRepositoryCount;
Expand All @@ -22,7 +23,6 @@
import java.util.Set;
import java.util.SortedMap;

import javax.jcr.Item;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.PropertyType;
Expand All @@ -40,7 +40,6 @@

import org.fcrepo.rdf.GraphSubjects;
import org.fcrepo.services.LowLevelStorageService;
import org.fcrepo.services.MetricsService;
import org.fcrepo.services.functions.GetClusterConfiguration;
import org.modeshape.jcr.api.JcrConstants;
import org.modeshape.jcr.api.NamespaceRegistry;
Expand Down Expand Up @@ -262,8 +261,7 @@ private static void addRepositoryMetricsToModel(

final Repository repository = node.getSession().getRepository();
/* retreive the metrics from the service */
final SortedMap<String, Counter> counters =
MetricsService.getMetrics().getCounters();
final SortedMap<String, Counter> counters = getMetrics().getCounters();

final Resource subject = factory.getGraphSubject(node);
for (final String key : repository.getDescriptorKeys()) {
Expand Down
Expand Up @@ -3,9 +3,6 @@

import static org.slf4j.LoggerFactory.getLogger;

import org.fcrepo.services.MetricsService;
import org.fcrepo.services.RepositoryService;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.slf4j.Logger;
Expand All @@ -20,10 +17,4 @@ public abstract class AbstractIT {
public void setLogger() {
logger = getLogger(this.getClass());
}

@AfterClass
public static void dumpMetrics() {
MetricsService.dumpMetrics(System.out);
}

}
5 changes: 0 additions & 5 deletions fcrepo-metrics/pom.xml
Expand Up @@ -11,21 +11,16 @@

<artifactId>fcrepo-metrics</artifactId>


<dependencies>

<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics.version}</version>
</dependency>


<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-graphite</artifactId>
<version>${metrics.version}</version>
</dependency>

</dependencies>
</project>
Expand Up @@ -6,13 +6,15 @@
import com.codahale.metrics.ConsoleReporter;
import com.codahale.metrics.MetricFilter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;

public abstract class RegistryService {

private static final MetricRegistry metrics = new MetricRegistry();
private static final MetricRegistry METRICS = SharedMetricRegistries
.getOrCreate("fcrepo-metrics");

public static MetricRegistry getMetrics() {
return metrics;
return METRICS;
}

public static void dumpMetrics(final PrintStream os) {
Expand All @@ -28,5 +30,4 @@ public static void dumpMetrics(final PrintStream os) {
.getMeters(filter), registry.getTimers(filter));

}

}
@@ -1,10 +1,13 @@
package org.fcrepo.services;

import com.codahale.metrics.MetricRegistry;
import org.junit.Test;
import static org.fcrepo.metrics.RegistryService.dumpMetrics;

import java.io.PrintStream;

import org.junit.Test;

import com.codahale.metrics.MetricRegistry;

public class MetricsServiceTest {

MetricRegistry mockMetricRegistry;
Expand All @@ -13,6 +16,6 @@ public class MetricsServiceTest {

@Test
public void testDumpMetrics() {
MetricsService.dumpMetrics(mockPrintStream);
dumpMetrics(mockPrintStream);
}
}
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -33,7 +33,7 @@
<sesame.version>2.7.0</sesame.version>
<slf4j.version>1.7.5</slf4j.version>
<spring.version>3.2.0.RELEASE</spring.version>
<metrics.version>3.0.0-BETA3</metrics.version>
<metrics.version>3.0.0-RC1-SNAPSHOT</metrics.version>

<!-- https://github.com/github/maven-plugins/blob/master/README.md -->
<github.global.server>github</github.global.server>
Expand Down

0 comments on commit 519f027

Please sign in to comment.