Skip to content

Update servo to 0.6 #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjchristensen merged 1 commit into from
Apr 15, 2014
Merged

Update servo to 0.6 #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion hystrix-contrib/hystrix-servo-metrics-publisher/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apply plugin: 'idea'

dependencies {
compile project(':hystrix-core')
compile 'com.netflix.servo:servo-core:0.4.32'
compile 'com.netflix.servo:servo-core:0.6.+'
}

eclipse {
Expand Down
26 changes: 25 additions & 1 deletion ...java/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,29 @@ protected abstract class InformationalMetric<K> extends AbstractMonitor<K> {
public InformationalMetric(MonitorConfig config) {
super(config.withAdditionalTag(DataSourceType.INFORMATIONAL).withAdditionalTag(getServoTypeTag()).withAdditionalTag(getServoInstanceTag()));
}

@Override
public K getValue(int n) {
return getValue();
}

@Override
public abstract K getValue();
}

protected abstract class CounterMetric extends AbstractMonitor<Long> implements Counter {
protected abstract class CounterMetric extends AbstractMonitor<Number> implements Counter {
public CounterMetric(MonitorConfig config) {
super(config.withAdditionalTag(DataSourceType.COUNTER).withAdditionalTag(getServoTypeTag()).withAdditionalTag(getServoInstanceTag()));
}

@Override
public Number getValue(int n) {
return getValue();
}

@Override
public abstract Number getValue();

@Override
public void increment() {
throw new IllegalStateException("We are wrapping a value instead.");
Expand All @@ -61,6 +77,14 @@ protected abstract class GaugeMetric extends AbstractMonitor<Number> implements
public GaugeMetric(MonitorConfig config) {
super(config.withAdditionalTag(DataSourceType.GAUGE).withAdditionalTag(getServoTypeTag()).withAdditionalTag(getServoInstanceTag()));
}

@Override
public Number getValue(int n) {
return getValue();
}

@Override
public abstract Number getValue();
}

protected Monitor<?> getCumulativeCountForEvent(String name, final HystrixCommandMetrics metrics, final HystrixRollingNumberEvent event) {
Expand Down