Author: chetanm
Date: Tue Nov 24 15:51:46 2015
New Revision: 1716184
URL: http://svn.apache.org/viewvc?rev=1716184&view=rev
Log:
OAK-3654 - Integrate with Metrics for various stats collection
Introduce a marker interface Stats to mark all stats types
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/Stats.java
- copied, changed from r1716183,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/TimerStats.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java?rev=1716184&r1=1716183&r2=1716184&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
Tue Nov 24 15:51:46 2015
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.stats;
import aQute.bnd.annotation.ProviderType;
@ProviderType
-public interface CounterStats {
+public interface CounterStats extends Stats{
/**
* Returns the counter's current value.
*
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java?rev=1716184&r1=1716183&r2=1716184&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
Tue Nov 24 15:51:46 2015
@@ -22,7 +22,7 @@ package org.apache.jackrabbit.oak.stats;
import aQute.bnd.annotation.ProviderType;
@ProviderType
-public interface MeterStats {
+public interface MeterStats extends Stats{
/**
* Mark the occurrence of an event.
*/
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/Stats.java
(from r1716183,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/Stats.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/Stats.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java&r1=1716183&r2=1716184&rev=1716184&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/MeterStats.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/Stats.java
Tue Nov 24 15:51:46 2015
@@ -19,19 +19,8 @@
package org.apache.jackrabbit.oak.stats;
-import aQute.bnd.annotation.ProviderType;
-
-@ProviderType
-public interface MeterStats {
- /**
- * Mark the occurrence of an event.
- */
- void mark();
-
- /**
- * Mark the occurrence of a given number of events.
- *
- * @param n the number of events
- */
- void mark(long n);
+/**
+ * A tag interface to indicate that a class is a Stat.
+ */
+public interface Stats {
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/TimerStats.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/TimerStats.java?rev=1716184&r1=1716183&r2=1716184&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/TimerStats.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/TimerStats.java
Tue Nov 24 15:51:46 2015
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit;
import aQute.bnd.annotation.ProviderType;
@ProviderType
-public interface TimerStats {
+public interface TimerStats extends Stats{
/**
* Adds a recorded duration.
*