Merge pull request #667 from Netflix/feature/di-friendly-server

Feature/di friendly server
Netflix · Oct 2, 2015 · caf7661 · caf7661
2 parents 7fadaa1 + 6b18edc
commit caf7661
Show file tree

Hide file tree

Showing 108 changed files with 3,661 additions and 1,823 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 }
 
 plugins {
-    id 'nebula.netflixoss' version '2.2.7'
+    id 'nebula.netflixoss' version '2.2.10'
 }
 
 ext {
@@ -19,16 +19,17 @@ ext {
     apacheHttpClientVersion='4.3.4'
     guiceVersion='4.0'
     servoVersion='0.9.4'
-    governatorVersion='1.7.5'
+    governatorVersion='1.10.4'
     archaiusVersion='0.7.1'
-    archaius2Version='2.0.0-rc.28'
+    archaius2Version='2.0.0-rc.32'
     blitzVersion='1.34'
     mockitoVersion='1.10.19'
     junit_version='4.10'
     mockserverVersion='3.9.2'
     jetty_version='7.2.0.v20101020'
     jacksonVersion='2.5.4'
     woodstoxVersion='4.4.1'
+    karyon3Version='3.0.1-rc.13'
 }
 
 idea {

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/AmazonInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/AmazonInfo.java
@@ -68,6 +68,7 @@ public enum MetaDataKey {
         instanceId("instance-id"),
         instanceType("instance-type"),
         localIpv4("local-ipv4"),
+        localHostname("local-hostname"),
         availabilityZone("availability-zone", "placement/"),
         publicHostname("public-hostname"),
         publicIpv4("public-ipv4"),

diff --git a/eureka-client/src/main/java/com/netflix/appinfo/ApplicationInfoManager.java b/eureka-client/src/main/java/com/netflix/appinfo/ApplicationInfoManager.java
@@ -72,6 +72,10 @@ public ApplicationInfoManager(EurekaInstanceConfig config, InstanceInfo instance
         instance = this;
     }
 
+    public ApplicationInfoManager(EurekaInstanceConfig config) {
+        this(config, new EurekaConfigBasedInstanceInfoProvider(config).get());
+    }
+
     /**
      * @deprecated please use DI instead
      */
@@ -85,8 +89,7 @@ public void initComponent(EurekaInstanceConfig config) {
             this.config = config;
             this.instanceInfo = new EurekaConfigBasedInstanceInfoProvider(config).get();
         } catch (Throwable e) {
-            throw new RuntimeException(
-                    "Failed to initialize ApplicationInfoManager", e);
+            throw new RuntimeException("Failed to initialize ApplicationInfoManager", e);
         }
     }
 

diff --git a/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java b/eureka-client/src/main/java/com/netflix/discovery/AbstractAzToRegionMapper.java
@@ -25,6 +25,8 @@ public abstract class AbstractAzToRegionMapper implements AzToRegionMapper {
     private static final Logger logger = LoggerFactory.getLogger(InstanceRegionChecker.class);
     private static final String[] EMPTY_STR_ARRAY = new String[0];
 
+    protected final EurekaClientConfig clientConfig;
+
     /**
      * A default for the mapping that we know of, if a remote region is configured to be fetched but does not have
      * any availability zone mapping, we will use these defaults. OTOH, if the remote region has any mapping defaults
@@ -41,7 +43,8 @@ public List<String> get() {
     private final Map<String, String> availabilityZoneVsRegion = new ConcurrentHashMap<String, String>();
     private String[] regionsToFetch;
 
-    protected AbstractAzToRegionMapper() {
+    protected AbstractAzToRegionMapper(EurekaClientConfig clientConfig) {
+        this.clientConfig = clientConfig;
         populateDefaultAZToRegionMap();
     }
 

diff --git a/eureka-client/src/main/java/com/netflix/discovery/DNSBasedAzToRegionMapper.java b/eureka-client/src/main/java/com/netflix/discovery/DNSBasedAzToRegionMapper.java
@@ -1,5 +1,7 @@
 package com.netflix.discovery;
 
+import com.netflix.discovery.endpoint.EndpointUtils;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -11,10 +13,14 @@
  */
 public class DNSBasedAzToRegionMapper extends AbstractAzToRegionMapper {
 
+    public DNSBasedAzToRegionMapper(EurekaClientConfig clientConfig) {
+        super(clientConfig);
+    }
+
     @Override
     protected Set<String> getZonesForARegion(String region) {
-        Map<String, List<String>> zoneBasedDiscoveryUrlsFromRegion =
-                DiscoveryClient.getZoneBasedDiscoveryUrlsFromRegion(region);
+        Map<String, List<String>> zoneBasedDiscoveryUrlsFromRegion = EndpointUtils
+                .getZoneBasedDiscoveryUrlsFromRegion(clientConfig, region);
         if (null != zoneBasedDiscoveryUrlsFromRegion) {
             return zoneBasedDiscoveryUrlsFromRegion.keySet();
         }