Moving provided metric consumers into a separate package

zhoupan · Jan 12, 2016 · 3d180d3 · 3d180d3
1 parent f76263d
commit 3d180d3
Show file tree

Hide file tree

Showing 33 changed files with 112 additions and 126 deletions.
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapserMetrics.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapserMetrics.java
@@ -15,23 +15,21 @@
  */
 package com.netflix.hystrix;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.netflix.hystrix.metric.CumulativeCollapserEventCounterStream;
 import com.netflix.hystrix.metric.HystrixCollapserEvent;
 import com.netflix.hystrix.metric.HystrixThreadEventStream;
-import com.netflix.hystrix.metric.RollingCollapserBatchSizeDistributionStream;
-import com.netflix.hystrix.metric.RollingCollapserEventCounterStream;
+import com.netflix.hystrix.metric.consumer.CumulativeCollapserEventCounterStream;
+import com.netflix.hystrix.metric.consumer.RollingCollapserBatchSizeDistributionStream;
+import com.netflix.hystrix.metric.consumer.RollingCollapserEventCounterStream;
 import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
-import com.netflix.hystrix.util.HystrixRollingNumber;
 import com.netflix.hystrix.util.HystrixRollingNumberEvent;
-import com.netflix.hystrix.util.HystrixRollingPercentile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import rx.functions.Func2;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Used by {@link HystrixCollapser} to record metrics.
  * {@link HystrixEventNotifier} not hooked up yet.  It may be in the future.

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandMetrics.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandMetrics.java
@@ -15,28 +15,27 @@
  */
 package com.netflix.hystrix;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.netflix.hystrix.metric.CumulativeCommandEventCounterStream;
-import com.netflix.hystrix.metric.HealthCountsStream;
 import com.netflix.hystrix.metric.HystrixCommandCompletion;
 import com.netflix.hystrix.metric.HystrixThreadEventStream;
-import com.netflix.hystrix.metric.RollingCommandMaxConcurrencyStream;
-import com.netflix.hystrix.metric.RollingCommandEventCounterStream;
-import com.netflix.hystrix.metric.RollingCommandLatencyDistributionStream;
-import com.netflix.hystrix.metric.RollingCommandUserLatencyDistributionStream;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import com.netflix.hystrix.metric.consumer.CumulativeCommandEventCounterStream;
+import com.netflix.hystrix.metric.consumer.HealthCountsStream;
+import com.netflix.hystrix.metric.consumer.RollingCommandEventCounterStream;
+import com.netflix.hystrix.metric.consumer.RollingCommandLatencyDistributionStream;
+import com.netflix.hystrix.metric.consumer.RollingCommandMaxConcurrencyStream;
+import com.netflix.hystrix.metric.consumer.RollingCommandUserLatencyDistributionStream;
 import com.netflix.hystrix.strategy.HystrixPlugins;
 import com.netflix.hystrix.strategy.eventnotifier.HystrixEventNotifier;
 import com.netflix.hystrix.util.HystrixRollingNumberEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import rx.functions.Func0;
 import rx.functions.Func2;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Used by {@link HystrixCommand} to record metrics.
  */

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixThreadPoolMetrics.java
@@ -15,24 +15,23 @@
  */
 package com.netflix.hystrix;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.netflix.hystrix.metric.CumulativeThreadPoolEventCounterStream;
 import com.netflix.hystrix.metric.HystrixCommandCompletion;
-import com.netflix.hystrix.metric.RollingThreadPoolConcurrencyStream;
-import com.netflix.hystrix.metric.RollingThreadPoolEventCounterStream;
+import com.netflix.hystrix.metric.consumer.CumulativeThreadPoolEventCounterStream;
+import com.netflix.hystrix.metric.consumer.RollingThreadPoolConcurrencyStream;
+import com.netflix.hystrix.metric.consumer.RollingThreadPoolEventCounterStream;
 import com.netflix.hystrix.util.HystrixRollingNumberEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import rx.functions.Func0;
 import rx.functions.Func2;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * Used by {@link HystrixThreadPool} to record metrics.
  */

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixCommandConstructed.java b/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixCommandConstructed.java
diff --git a/...hystrix/metric/BucketedCounterStream.java → ...etric/consumer/BucketedCounterStream.java b/...hystrix/metric/BucketedCounterStream.java → ...etric/consumer/BucketedCounterStream.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
+import com.netflix.hystrix.metric.HystrixEvent;
+import com.netflix.hystrix.metric.HystrixEventStream;
 import rx.Observable;
 import rx.Subscription;
 import rx.functions.Func0;

diff --git a/...tric/BucketedCumulativeCounterStream.java → ...umer/BucketedCumulativeCounterStream.java b/...tric/BucketedCumulativeCounterStream.java → ...umer/BucketedCumulativeCounterStream.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
+import com.netflix.hystrix.metric.HystrixEvent;
+import com.netflix.hystrix.metric.HystrixEventStream;
 import rx.Observable;
 import rx.functions.Func2;
 

diff --git a/.../metric/BucketedRollingCounterStream.java → ...onsumer/BucketedRollingCounterStream.java b/.../metric/BucketedRollingCounterStream.java → ...onsumer/BucketedRollingCounterStream.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
+import com.netflix.hystrix.metric.HystrixEvent;
+import com.netflix.hystrix.metric.HystrixEventStream;
 import rx.Observable;
 import rx.functions.Func1;
 import rx.functions.Func2;

diff --git a/...umulativeCollapserEventCounterStream.java → ...umulativeCollapserEventCounterStream.java b/...umulativeCollapserEventCounterStream.java → ...umulativeCollapserEventCounterStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCollapserKey;
 import com.netflix.hystrix.HystrixCollapserMetrics;
 import com.netflix.hystrix.HystrixCollapserProperties;
 import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.metric.HystrixCollapserEvent;
+import com.netflix.hystrix.metric.HystrixCollapserEventStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/.../CumulativeCommandEventCounterStream.java → .../CumulativeCommandEventCounterStream.java b/.../CumulativeCommandEventCounterStream.java → .../CumulativeCommandEventCounterStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandMetrics;
 import com.netflix.hystrix.HystrixCommandProperties;
 import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixCommandCompletionStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...mulativeThreadPoolEventCounterStream.java → ...mulativeThreadPoolEventCounterStream.java b/...mulativeThreadPoolEventCounterStream.java → ...mulativeThreadPoolEventCounterStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixEventType;
 import com.netflix.hystrix.HystrixThreadPoolKey;
 import com.netflix.hystrix.HystrixThreadPoolMetrics;
 import com.netflix.hystrix.HystrixThreadPoolProperties;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixThreadPoolCompletionStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...ix/hystrix/metric/HealthCountsStream.java → ...x/metric/consumer/HealthCountsStream.java b/...ix/hystrix/metric/HealthCountsStream.java → ...x/metric/consumer/HealthCountsStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandMetrics;
 import com.netflix.hystrix.HystrixCommandProperties;
 import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixCommandCompletionStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...CollapserBatchSizeDistributionStream.java → ...CollapserBatchSizeDistributionStream.java b/...CollapserBatchSizeDistributionStream.java → ...CollapserBatchSizeDistributionStream.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCollapserKey;
 import com.netflix.hystrix.HystrixCollapserProperties;
-
+import com.netflix.hystrix.metric.HystrixCollapserEvent;
+import com.netflix.hystrix.metric.HystrixCollapserEventStream;
 import org.HdrHistogram.Histogram;
 import rx.functions.Func2;
 

diff --git a/...c/RollingCollapserEventCounterStream.java → ...r/RollingCollapserEventCounterStream.java b/...c/RollingCollapserEventCounterStream.java → ...r/RollingCollapserEventCounterStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCollapserKey;
 import com.netflix.hystrix.HystrixCollapserMetrics;
 import com.netflix.hystrix.HystrixCollapserProperties;
 import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.metric.HystrixCollapserEvent;
+import com.netflix.hystrix.metric.HystrixCollapserEventStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...ric/RollingCommandEventCounterStream.java → ...mer/RollingCommandEventCounterStream.java b/...ric/RollingCommandEventCounterStream.java → ...mer/RollingCommandEventCounterStream.java
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandMetrics;
 import com.netflix.hystrix.HystrixCommandProperties;
 import com.netflix.hystrix.HystrixEventType;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixCommandCompletionStream;
 import rx.functions.Func2;
 
 import java.util.concurrent.ConcurrentHashMap;

diff --git a/...lingCommandLatencyDistributionStream.java → ...lingCommandLatencyDistributionStream.java b/...lingCommandLatencyDistributionStream.java → ...lingCommandLatencyDistributionStream.java
@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandProperties;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixCommandCompletionStream;
+import com.netflix.hystrix.metric.HystrixCommandEvent;
 import org.HdrHistogram.Histogram;
 import rx.functions.Func2;
 

diff --git a/...c/RollingCommandMaxConcurrencyStream.java → ...r/RollingCommandMaxConcurrencyStream.java b/...c/RollingCommandMaxConcurrencyStream.java → ...r/RollingCommandMaxConcurrencyStream.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandProperties;
+import com.netflix.hystrix.metric.HystrixCommandStartStream;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

diff --git a/...CommandUserLatencyDistributionStream.java → ...CommandUserLatencyDistributionStream.java b/...CommandUserLatencyDistributionStream.java → ...CommandUserLatencyDistributionStream.java
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCollapserProperties;
 
 import com.netflix.hystrix.HystrixCommandKey;
 import com.netflix.hystrix.HystrixCommandProperties;
+import com.netflix.hystrix.metric.HystrixCommandCompletion;
+import com.netflix.hystrix.metric.HystrixCommandCompletionStream;
+import com.netflix.hystrix.metric.HystrixCommandEvent;
 import org.HdrHistogram.Histogram;
 import rx.functions.Func2;
 

diff --git a/...trix/metric/RollingConcurrencyStream.java → ...ic/consumer/RollingConcurrencyStream.java b/...trix/metric/RollingConcurrencyStream.java → ...ic/consumer/RollingConcurrencyStream.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCommandProperties;
+import com.netflix.hystrix.metric.HystrixCommandExecutionStarted;
+import com.netflix.hystrix.metric.HystrixEventStream;
 import rx.Observable;
 import rx.Subscription;
 import rx.functions.Func0;

diff --git a/...rix/metric/RollingDistributionStream.java → ...c/consumer/RollingDistributionStream.java b/...rix/metric/RollingDistributionStream.java → ...c/consumer/RollingDistributionStream.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixCollapserProperties;
 
+import com.netflix.hystrix.metric.HystrixEvent;
+import com.netflix.hystrix.metric.HystrixEventStream;
 import org.HdrHistogram.Histogram;
 import rx.Observable;
 import rx.Subscription;

diff --git a/...c/RollingThreadPoolConcurrencyStream.java → ...r/RollingThreadPoolConcurrencyStream.java b/...c/RollingThreadPoolConcurrencyStream.java → ...r/RollingThreadPoolConcurrencyStream.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.netflix.hystrix.metric;
+package com.netflix.hystrix.metric.consumer;
 
 import com.netflix.hystrix.HystrixThreadPoolKey;
 import com.netflix.hystrix.HystrixThreadPoolProperties;
+import com.netflix.hystrix.metric.HystrixThreadPoolStartStream;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;