Merge remote-tracking branch 'remotes/netflix/master'

Conflicts:
	eureka-client/src/main/java/com/netflix/discovery/converters/EurekaJacksonCodec.java

eureka-client/src/main/java/com/netflix/appinfo/ApplicationInfoManager.java

@@ -64,6 +64,10 @@ private ApplicationInfoManager() {
         instance = this;
     }
 
+    /**
+     * @deprecated please use DI instead
+     */
+    @Deprecated
     public static ApplicationInfoManager getInstance() {
         return instance;
     }

eureka-client/src/main/java/com/netflix/appinfo/EurekaInstanceConfig.java

@@ -22,7 +22,7 @@
 /**
  * Configuration information required by the instance to register with Eureka
  * server. Once registered, users can look up information from
- * {@link com.netflix.discovery.DiscoveryClient} based on virtual hostname (also called VIPAddress),
+ * {@link com.netflix.discovery.EurekaClient} based on virtual hostname (also called VIPAddress),
  * the most common way of doing it or by other means to get the information
  * necessary to talk to other instances registered with <em>Eureka</em>.
  *

eureka-client/src/main/java/com/netflix/appinfo/HealthCheckCallback.java

@@ -18,7 +18,7 @@
 
 /**
  * Applications can implement this interface and register a callback with the
- * {@link com.netflix.discovery.DiscoveryClient#registerHealthCheckCallback(HealthCheckCallback)}.
+ * {@link com.netflix.discovery.EurekaClient#registerHealthCheckCallback(HealthCheckCallback)}.
  *
  * <p>
  * Your callback will be invoked every

eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java

@@ -1011,7 +1011,7 @@ public synchronized void setOverriddenStatus(InstanceStatus status) {
     }
 
     /**
-     * Returns whether any state changed so that {@link DiscoveryClient} can
+     * Returns whether any state changed so that {@link com.netflix.discovery.EurekaClient} can
      * check whether to retransmit info or not on the next heartbeat.
      *
      * @return true if the {@link InstanceInfo} is dirty, false otherwise.
@@ -1061,7 +1061,7 @@ public Boolean isCoordinatingDiscoveryServer() {
 
     /**
      * Returns the type of action done on the instance in the server.Primarily
-     * used for updating deltas in the {@link com.netflix.discovery.DiscoveryClient}
+     * used for updating deltas in the {@link com.netflix.discovery.EurekaClient}
      * instance.
      *
      * @return action type done on the instance.
@@ -1153,4 +1153,30 @@ private static String resolveDeploymentContextBasedVipAddresses(
         return result;
     }
 
+    /**
+     * Get the zone that a particular instance is in.
+     * Note that for AWS deployments, myInfo should contain AWS dataCenterInfo which should contain
+     * the AWS zone of the instance, and availZones is ignored.
+     *
+     * @param availZones the list of available zones for non-AWS deployments
+     * @param myInfo
+     *            - The InstanceInfo object of the instance.
+     * @return - The zone in which the particular instance belongs to.
+     */
+    public static String getZone(String[] availZones, InstanceInfo myInfo) {
+        String instanceZone = ((availZones == null || availZones.length == 0) ? "default"
+                : availZones[0]);
+        if (myInfo != null
+                && myInfo.getDataCenterInfo().getName() == DataCenterInfo.Name.Amazon) {
+
+            String awsInstanceZone = ((AmazonInfo) myInfo.getDataCenterInfo())
+                    .get(AmazonInfo.MetaDataKey.availabilityZone);
+            if (awsInstanceZone != null) {
+                instanceZone = awsInstanceZone;
+            }
+
+        }
+        return instanceZone;
+    }
+
 }

eureka-client/src/main/java/com/netflix/appinfo/providers/CloudInstanceConfigProvider.java

@@ -1,7 +1,5 @@
 package com.netflix.appinfo.providers;
 
-import javax.inject.Singleton;
-
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.netflix.appinfo.CloudInstanceConfig;
@@ -12,7 +10,6 @@
  * This provider is necessary because the namespace is optional.
  * @author elandau
  */
-@Singleton
 public class CloudInstanceConfigProvider implements Provider<CloudInstanceConfig> {
     @Inject(optional = true)
     @EurekaNamespace

eureka-client/src/main/java/com/netflix/appinfo/providers/EurekaConfigBasedInstanceInfoProvider.java

@@ -3,7 +3,6 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Singleton;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +13,6 @@
 import com.netflix.appinfo.LeaseInfo;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
 import com.netflix.appinfo.InstanceInfo.PortType;
-import com.netflix.governator.guice.lazy.LazySingleton;
 
 /**
  * InstanceInfo provider that constructs the InstanceInfo this this instance using
@@ -23,7 +21,6 @@
  * @author elandau
  *
  */
-@LazySingleton
 public class EurekaConfigBasedInstanceInfoProvider implements Provider<InstanceInfo> {
     private static final Logger LOG = LoggerFactory.getLogger(EurekaConfigBasedInstanceInfoProvider.class);
 

eureka-client/src/main/java/com/netflix/appinfo/providers/MyDataCenterInstanceConfigProvider.java

@@ -2,11 +2,12 @@
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
+import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.MyDataCenterInstanceConfig;
 import com.netflix.discovery.DiscoveryManager;
 import com.netflix.discovery.EurekaNamespace;
 
-public class MyDataCenterInstanceConfigProvider implements Provider<MyDataCenterInstanceConfig> {
+public class MyDataCenterInstanceConfigProvider implements Provider<EurekaInstanceConfig> {
     @Inject(optional = true)
     @EurekaNamespace
     private String namespace;
@@ -21,7 +22,8 @@ public synchronized MyDataCenterInstanceConfig get() {
             } else {
                 config = new MyDataCenterInstanceConfig(namespace);
             }
-
+
+            // TODO: Remove this when DiscoveryManager is finally no longer used
             DiscoveryManager.getInstance().setEurekaInstanceConfig(config);
         }
         return config;

eureka-client/src/main/java/com/netflix/discovery/DefaultEurekaClientConfig.java

@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.List;
 
+import com.netflix.governator.guice.lazy.FineGrainedLazySingleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,6 +56,7 @@
  * @author Karthik Ranganathan
  *
  */
+@FineGrainedLazySingleton
 @ProvidedBy(DefaultEurekaClientConfigProvider.class)
 public class DefaultEurekaClientConfig implements EurekaClientConfig {
     private static final String ARCHAIUS_DEPLOYMENT_ENVIRONMENT = "archaius.deployment.environment";