Merge pull request #35 from cfieber/master

dependency update
spinnaker · Apr 11, 2016 · 4a1e8cc · 4a1e8cc
2 parents ea52796 + 21fc0e3
commit 4a1e8cc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -33,7 +33,7 @@ allprojects {
   group = 'com.netflix.spinnaker.kork'
 
   spinnaker {
-    dependenciesVersion = "0.22.0"
+    dependenciesVersion = "0.32.0"
   }
 
   jacoco {

diff --git a/kork-core/src/main/java/com/netflix/spinnaker/kork/aws/AwsComponents.java b/kork-core/src/main/java/com/netflix/spinnaker/kork/aws/AwsComponents.java
@@ -21,7 +21,7 @@
 import com.amazonaws.metrics.AwsSdkMetrics;
 import com.amazonaws.retry.RetryPolicy;
 import com.netflix.spectator.api.Registry;
-import com.netflix.spectator.aws.SpectatorMetricsCollector;
+import com.netflix.spectator.aws.SpectatorMetricCollector;
 import com.netflix.spinnaker.kork.metrics.SpectatorConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
@@ -48,8 +48,8 @@ RetryPolicy.BackoffStrategy instrumentedBackoffStrategy(Registry registry) {
   }
 
   @Bean
-  SpectatorMetricsCollector spectatorMetricsCollector(Registry registry) {
-    SpectatorMetricsCollector collector = new SpectatorMetricsCollector(registry);
+  SpectatorMetricCollector spectatorMetricsCollector(Registry registry) {
+    SpectatorMetricCollector collector = new SpectatorMetricCollector(registry);
     AwsSdkMetrics.setMetricCollector(collector);
     return collector;
   }

diff --git a/kork-core/src/main/java/com/netflix/spinnaker/kork/eureka/EurekaComponents.java b/kork-core/src/main/java/com/netflix/spinnaker/kork/eureka/EurekaComponents.java
@@ -19,6 +19,7 @@
 import com.netflix.appinfo.*;
 import com.netflix.discovery.DefaultEurekaClientConfig;
 import com.netflix.discovery.DiscoveryClient;
+import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.StatusChangeEvent;
 import com.netflix.eventbus.impl.EventBusImpl;
@@ -62,10 +63,16 @@ public EventBus eventBus() {
   }
 
   @Bean
+  @Deprecated //prefer to use EurekaClient interface rather than directly depending on DiscoveryClient
   public DiscoveryClient discoveryClient(ApplicationInfoManager applicationInfoManager, EurekaClientConfig eurekaClientConfig, DiscoveryClient.DiscoveryClientOptionalArgs optionalArgs) {
     return new DiscoveryClient(applicationInfoManager, eurekaClientConfig, optionalArgs);
   }
 
+  @Bean
+  public EurekaClient eurekaClient(DiscoveryClient discoveryClient) {
+    return discoveryClient;
+  }
+
   @Bean
   public ApplicationInfoManager applicationInfoManager(EurekaInstanceConfig eurekaInstanceConfig) {
     return new ApplicationInfoManager(eurekaInstanceConfig);