You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 05:39:30 UTC
svn commit: r1079144 - in /hadoop/common/branches/yahoo-merge/src:
java/org/apache/hadoop/metrics/ java/org/apache/hadoop/metrics/ganglia/
java/org/apache/hadoop/metrics/jvm/ java/org/apache/hadoop/metrics/spi/
java/org/apache/hadoop/metrics/util/ test...
Author: omalley
Date: Tue Mar 8 04:39:29 2011
New Revision: 1079144
URL: http://svn.apache.org/viewvc?rev=1079144&view=rev
Log:
commit e1330796ccbde951002856d167e39ccec6df23fb
Author: Luke Lu <ll...@yahoo-inc.com>
Date: Fri Oct 29 15:49:46 2010 -0700
HADOOP:6728 Metrics 2.0: deprecate old metrics code
See for patches/reviews.
Modified:
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ContextFactory.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsException.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsRecord.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsServlet.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsUtil.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/Updater.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/package.html
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricValue.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContext.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/package.html
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsBase.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ContextFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ContextFactory.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ContextFactory.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ContextFactory.java Tue Mar 8 04:39:29 2011
@@ -36,7 +36,9 @@ import org.apache.hadoop.metrics.spi.Nul
/**
* Factory class for creating MetricsContext objects. To obtain an instance
* of this class, use the static <code>getFactory()</code> method.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
public class ContextFactory {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsContext.java Tue Mar 8 04:39:29 2011
@@ -30,7 +30,9 @@ import org.apache.hadoop.metrics.spi.Out
/**
* The main interface to the metrics package.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Private
@InterfaceStability.Evolving
public interface MetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsException.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsException.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsException.java Tue Mar 8 04:39:29 2011
@@ -25,7 +25,9 @@ import org.apache.hadoop.classification.
/**
* General-purpose, unchecked metrics exception.
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.MetricsException}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
public class MetricsException extends RuntimeException {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsRecord.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsRecord.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsRecord.java Tue Mar 8 04:39:29 2011
@@ -67,7 +67,9 @@ import org.apache.hadoop.classification.
* it is OK for different threads to call <code>update()</code> on MetricsRecord instances
* with the same set of tag names and tag values. Different threads should
* <b>not</b> use the same MetricsRecord instance at the same time.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Private
@InterfaceStability.Evolving
public interface MetricsRecord {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsServlet.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsServlet.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsServlet.java Tue Mar 8 04:39:29 2011
@@ -43,7 +43,9 @@ import org.mortbay.util.ajax.JSON.Output
* A servlet to print out metrics data. By default, the servlet returns a
* textual representation (no promises are made for parseability), and
* users can use "?format=json" for parseable output.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class MetricsServlet extends HttpServlet {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsUtil.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsUtil.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/MetricsUtil.java Tue Mar 8 04:39:29 2011
@@ -32,7 +32,9 @@ import org.apache.hadoop.classification.
* @see org.apache.hadoop.metrics.MetricsRecord
* @see org.apache.hadoop.metrics.MetricsContext
* @see org.apache.hadoop.metrics.ContextFactory
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
public class MetricsUtil {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/Updater.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/Updater.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/Updater.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/Updater.java Tue Mar 8 04:39:29 2011
@@ -25,7 +25,9 @@ import org.apache.hadoop.classification.
/**
* Call-back interface. See <code>MetricsContext.registerUpdater()</code>.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
@InterfaceStability.Evolving
public interface Updater {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Tue Mar 8 04:39:29 2011
@@ -43,7 +43,9 @@ import org.apache.hadoop.metrics.spi.Uti
/**
* Context for sending metrics to Ganglia.
*
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class GangliaContext extends AbstractMetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java Tue Mar 8 04:39:29 2011
@@ -40,7 +40,9 @@ import org.apache.commons.logging.LogFac
* Singleton class which reports Java Virtual Machine metrics to the metrics API.
* Any application can create an instance of this class in order to emit
* Java VM metrics.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Private
@InterfaceStability.Evolving
public class JvmMetrics implements Updater {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/package.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/package.html?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/package.html (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/package.html Tue Mar 8 04:39:29 2011
@@ -21,13 +21,14 @@
<title>org.apache.hadoop.metrics</title>
</head>
<body>
-This package defines an API for reporting performance metric information.
-<p/>
-The API is abstract so that it can be implemented on top of
+ <p><em>Note, this package is deprecated in favor of
+ <code>org.apache.hadoop.metrics2</code> usage.</em></p>
+ <p>This package defines an API for reporting performance metric information.</p>
+ <p>The API is abstract so that it can be implemented on top of
a variety of metrics client libraries. The choice of
client library is a configuration option, and different
modules within the same application can use
-different metrics implementation libraries.
+different metrics implementation libraries.</p>
<p/>
Sub-packages:
<dl>
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/AbstractMetricsContext.java Tue Mar 8 04:39:29 2011
@@ -51,7 +51,9 @@ import org.apache.hadoop.metrics.Updater
* on which data is to be sent to the metrics system. Subclasses must
* override the abstract <code>emitRecord</code> method in order to transmit
* the data. <p/>
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public abstract class AbstractMetricsContext implements MetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/CompositeContext.java Tue Mar 8 04:39:29 2011
@@ -35,6 +35,10 @@ import org.apache.hadoop.metrics.Metrics
import org.apache.hadoop.metrics.MetricsUtil;
import org.apache.hadoop.metrics.Updater;
+/**
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
+ */
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class CompositeContext extends AbstractMetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricValue.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricValue.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricValue.java Tue Mar 8 04:39:29 2011
@@ -25,7 +25,9 @@ import org.apache.hadoop.classification.
/**
* A Number that is either an absolute or an incremental amount.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class MetricValue {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java Tue Mar 8 04:39:29 2011
@@ -33,7 +33,9 @@ import org.apache.hadoop.metrics.spi.Abs
* An implementation of MetricsRecord. Keeps a back-pointer to the context
* from which it was created, and delegates back to it on <code>update</code>
* and <code>remove()</code>.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class MetricsRecordImpl implements MetricsRecord {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java Tue Mar 8 04:39:29 2011
@@ -28,7 +28,9 @@ import org.apache.hadoop.metrics.Metrics
*
* This is useful if you want to support {@link MetricsServlet}, but
* not emit metrics in any other way.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class NoEmitMetricsContext extends AbstractMetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContext.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContext.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContext.java Tue Mar 8 04:39:29 2011
@@ -27,7 +27,9 @@ import org.apache.hadoop.classification.
* default context, so that no performance data is emitted if no configuration
* data is found.
*
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class NullContext extends AbstractMetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java Tue Mar 8 04:39:29 2011
@@ -34,7 +34,9 @@ import org.apache.hadoop.metrics.Metrics
* The default impl of start and stop monitoring:
* is the AbstractMetricsContext is good enough.
*
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class NullContextWithUpdateThread extends AbstractMetricsContext {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/OutputRecord.java Tue Mar 8 04:39:29 2011
@@ -33,7 +33,9 @@ import org.apache.hadoop.metrics.spi.Abs
/**
* Represents a record of metric data to be sent to a metrics system.
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class OutputRecord {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/package.html
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/package.html?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/package.html (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/spi/package.html Tue Mar 8 04:39:29 2011
@@ -22,15 +22,17 @@
<title>org.apache.hadoop.metrics.spi</title>
</head>
<body>
-The Service Provider Interface for the Metrics API. This package provides
+ <p><em>Note, this package is deprecated in favor of
+ <code>org.apache.hadoop.metrics2</code> usage.</em></p>
+ <p>The Service Provider Interface for the Metrics API. This package provides
an interface allowing a variety of metrics reporting implementations to be
plugged in to the Metrics API. Examples of such implementations can be found
in the packages <code>org.apache.hadoop.metrics.file</code> and
-<code>org.apache.hadoop.metrics.ganglia</code>.<p/>
+<code>org.apache.hadoop.metrics.ganglia</code>.</p>
-Plugging in an implementation involves writing a concrete subclass of
+ <p>Plugging in an implementation involves writing a concrete subclass of
<code>AbstractMetricsContext</code>. The subclass should get its
configuration information using the <code>getAttribute(<i>attributeName</i>)</code>
- method.
+ method.</p>
</body>
</html>
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MBeanUtil.java Tue Mar 8 04:39:29 2011
@@ -31,9 +31,11 @@ import org.apache.hadoop.classification.
/**
* This util class provides a method to register an MBean using
* our standard naming convention as described in the doc
- * for {link {@link #registerMBean(String, String, Object)}
+ * for {@link #registerMBean(String, String, Object)}
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.util.MBeans}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MBeanUtil {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsBase.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsBase.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsBase.java Tue Mar 8 04:39:29 2011
@@ -24,7 +24,9 @@ import org.apache.hadoop.metrics.Metrics
*
* This is base class for all metrics
*
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.Private
public abstract class MetricsBase {
public static final String NO_DESCRIPTION = "NoDescription";
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java Tue Mar 8 04:39:29 2011
@@ -51,8 +51,9 @@ import org.apache.hadoop.metrics.Metrics
* ObjectName mbeanName = MBeanUtil.registerMBean("ServiceFoo",
* "TestStatistics", theMBean);
*
- *
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public abstract class MetricsDynamicMBeanBase implements DynamicMBean {
private final static String AVG_TIME = "AvgTime";
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsIntValue.java Tue Mar 8 04:39:29 2011
@@ -30,7 +30,9 @@ import org.apache.commons.logging.LogFac
* Each time its value is set, it is published only *once* at the next update
* call.
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableGaugeInt}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsIntValue extends MetricsBase {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsLongValue.java Tue Mar 8 04:39:29 2011
@@ -27,7 +27,9 @@ import org.apache.hadoop.metrics.Metrics
* Each time its value is set, it is published only *once* at the next update
* call.
*
+ * @deprecated in favor of <code>org.apache.hadoop.metrics2</code> usage.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsLongValue extends MetricsBase{
private long value;
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsRegistry.java Tue Mar 8 04:39:29 2011
@@ -29,7 +29,9 @@ import org.apache.hadoop.classification.
* Related set of metrics should be declared in a holding class and registered
* in a registry for those metrics which is also stored in the the holding class.
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MetricsRegistry}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsRegistry {
private Map<String, MetricsBase> metricsList = new HashMap<String, MetricsBase>();
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java Tue Mar 8 04:39:29 2011
@@ -34,7 +34,9 @@ import org.apache.commons.logging.LogFac
* Note if one wants a time associated with the metric then use
* @see org.apache.hadoop.metrics.util.MetricsTimeVaryingRate
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableCounterInt}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsTimeVaryingInt extends MetricsBase {
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java Tue Mar 8 04:39:29 2011
@@ -35,7 +35,9 @@ import org.apache.commons.logging.LogFac
* Note if one wants a time associated with the metric then use
* @see org.apache.hadoop.metrics.util.MetricsTimeVaryingRate
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableCounterLong}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsTimeVaryingLong extends MetricsBase{
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Tue Mar 8 04:39:29 2011
@@ -32,7 +32,9 @@ import org.apache.commons.logging.LogFac
* This class also keeps track of the min and max rates along with
* a method to reset the min-max.
*
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableRate}.
*/
+@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
public class MetricsTimeVaryingRate extends MetricsBase {
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/TestMetricsServlet.java Tue Mar 8 04:39:29 2011
@@ -32,6 +32,7 @@ import org.apache.hadoop.metrics.spi.NoE
import org.apache.hadoop.metrics.spi.OutputRecord;
import org.mortbay.util.ajax.JSON;
+@Deprecated
public class TestMetricsServlet extends TestCase {
MetricsContext nc1;
MetricsContext nc2;
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java?rev=1079144&r1=1079143&r2=1079144&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/metrics/spi/TestOutputRecord.java Tue Mar 8 04:39:29 2011
@@ -22,6 +22,7 @@ import org.apache.hadoop.metrics.spi.Abs
import junit.framework.TestCase;
+@Deprecated
public class TestOutputRecord extends TestCase {
public void testCopy() {
TagMap tags = new TagMap();