-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #763 from mattrjacobs/upgrade-jackson-for-metrics-…
…stream Upgraded Jackson from 1.x to 2.5.2 and split out HystrixMetricsPoller unit test
- Loading branch information
Showing
3 changed files
with
105 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| dependencies { | ||
| compile project(':hystrix-core') | ||
| compile 'org.codehaus.jackson:jackson-core-asl:1.9.2' | ||
| compile 'com.fasterxml.jackson.core:jackson-core:2.5.2' | ||
| provided 'javax.servlet:servlet-api:2.5' | ||
| provided 'junit:junit-dep:4.10' | ||
| testCompile 'junit:junit-dep:4.10' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
100 changes: 100 additions & 0 deletions
100
...c/test/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPollerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /** | ||
| * Copyright 2012 Netflix, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.netflix.hystrix.contrib.metrics.eventstream; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import com.netflix.hystrix.HystrixCommand; | ||
| import com.netflix.hystrix.HystrixCommandGroupKey; | ||
|
|
||
| /** | ||
| * Polls Hystrix metrics and output JSON strings for each metric to a MetricsPollerListener. | ||
| * <p> | ||
| * Polling can be stopped/started. Use shutdown() to permanently shutdown the poller. | ||
| */ | ||
| public class HystrixMetricsPollerTest { | ||
|
|
||
| @Test | ||
| public void testStartStopStart() { | ||
| final AtomicInteger metricsCount = new AtomicInteger(); | ||
|
|
||
| HystrixMetricsPoller poller = new HystrixMetricsPoller(new HystrixMetricsPoller.MetricsAsJsonPollerListener() { | ||
|
|
||
| @Override | ||
| public void handleJsonMetric(String json) { | ||
| System.out.println("Received: " + json); | ||
| metricsCount.incrementAndGet(); | ||
| } | ||
| }, 100); | ||
| try { | ||
|
|
||
| HystrixCommand<Boolean> test = new HystrixCommand<Boolean>(HystrixCommandGroupKey.Factory.asKey("HystrixMetricsPollerTest")) { | ||
|
|
||
| @Override | ||
| protected Boolean run() { | ||
| return true; | ||
| } | ||
|
|
||
| }; | ||
| test.execute(); | ||
|
|
||
| poller.start(); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| int v1 = metricsCount.get(); | ||
|
|
||
| assertTrue(v1 > 0); | ||
|
|
||
| poller.pause(); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| int v2 = metricsCount.get(); | ||
|
|
||
| // they should be the same since we were paused | ||
| assertTrue(v2 == v1); | ||
|
|
||
| poller.start(); | ||
|
|
||
| try { | ||
| Thread.sleep(500); | ||
| } catch (InterruptedException e) { | ||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| int v3 = metricsCount.get(); | ||
|
|
||
| // we should have more metrics again | ||
| assertTrue(v3 > v1); | ||
|
|
||
| } finally { | ||
| poller.shutdown(); | ||
| } | ||
| } | ||
| } |