feat(kayenta): Provide autoconfigurations for all Kayenta integration…

… modules (#577)
spinnaker · Jun 28, 2019 · 8354824 · 8354824
1 parent bf16762
commit 8354824
Show file tree

Hide file tree

Showing 43 changed files with 65 additions and 107 deletions.
diff --git a/...ta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/AtlasStorageUpdaterService.java b/...ta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/AtlasStorageUpdaterService.java
@@ -23,7 +23,6 @@
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -32,7 +31,6 @@
 
 @Service
 @Slf4j
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.atlas.enabled")
 public class AtlasStorageUpdaterService extends AbstractHealthIndicator {
   private final RetrofitClientFactory retrofitClientFactory;

diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/BackendUpdaterService.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/backends/BackendUpdaterService.java
@@ -23,7 +23,6 @@
 import org.springframework.boot.actuate.health.AbstractHealthIndicator;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
@@ -32,7 +31,6 @@
 
 @Service
 @Slf4j
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.atlas.enabled")
 public class BackendUpdaterService extends AbstractHealthIndicator {
   private final RetrofitClientFactory retrofitClientFactory;

diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasConfiguration.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/config/AtlasConfiguration.java
@@ -30,17 +30,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.atlas.enabled")
 @ComponentScan({"com.netflix.kayenta.atlas"})
 @Slf4j

diff --git a/kayenta-atlas/src/main/resources/META-INF/spring.factories b/kayenta-atlas/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.atlas.config.AtlasConfiguration
diff --git a/kayenta-aws/src/main/java/com/netflix/kayenta/aws/config/AwsConfiguration.java b/kayenta-aws/src/main/java/com/netflix/kayenta/aws/config/AwsConfiguration.java
@@ -33,7 +33,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -45,7 +44,6 @@
 import java.util.Optional;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.aws.enabled")
 @ComponentScan({"com.netflix.kayenta.aws"})
 @Slf4j

diff --git a/kayenta-aws/src/main/resources/META-INF/spring.factories b/kayenta-aws/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.aws.config.AwsConfiguration
diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/index/config/IndexConfiguration.java b/kayenta-core/src/main/java/com/netflix/kayenta/index/config/IndexConfiguration.java
@@ -22,14 +22,12 @@
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import com.netflix.kayenta.storage.StorageServiceRepository;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import redis.clients.jedis.JedisPool;
 
 @Configuration
-@EnableConfigurationProperties
 public class IndexConfiguration {
 
   @Bean

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/persistence/config/JedisConfig.java b/kayenta-core/src/main/java/com/netflix/kayenta/persistence/config/JedisConfig.java
@@ -20,14 +20,12 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
 @Configuration
-@EnableConfigurationProperties
 public class JedisConfig {
 
   @Bean

diff --git a/kayenta-datadog/src/main/java/com/netflix/kayenta/datadog/config/DatadogConfiguration.java b/kayenta-datadog/src/main/java/com/netflix/kayenta/datadog/config/DatadogConfiguration.java
@@ -29,7 +29,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -40,7 +39,6 @@
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.datadog.enabled")
 @ComponentScan({"com.netflix.kayenta.datadog"})
 @Slf4j

diff --git a/kayenta-datadog/src/main/resources/META-INF/spring.factories b/kayenta-datadog/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.datadog.config.DatadogConfiguration
diff --git a/kayenta-gcs/src/main/java/com/netflix/kayenta/gcs/config/GcsConfiguration.java b/kayenta-gcs/src/main/java/com/netflix/kayenta/gcs/config/GcsConfiguration.java
@@ -22,14 +22,12 @@
 import com.netflix.kayenta.security.AccountCredentialsRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.gcs.enabled")
 @ComponentScan({"com.netflix.kayenta.gcs"})
 @Slf4j

diff --git a/kayenta-gcs/src/main/resources/META-INF/spring.factories b/kayenta-gcs/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.gcs.config.GcsConfiguration
diff --git a/kayenta-google/src/main/java/com/netflix/kayenta/google/config/GoogleConfiguration.java b/kayenta-google/src/main/java/com/netflix/kayenta/google/config/GoogleConfiguration.java
@@ -24,7 +24,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -35,7 +34,6 @@
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.google.enabled")
 @ComponentScan({"com.netflix.kayenta.google"})
 @Slf4j

diff --git a/kayenta-google/src/main/resources/META-INF/spring.factories b/kayenta-google/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.google.config.GoogleConfiguration
diff --git a/...nta-graphite/src/main/java/com/netflix/kayenta/graphite/config/GraphiteConfiguration.java b/...nta-graphite/src/main/java/com/netflix/kayenta/graphite/config/GraphiteConfiguration.java
@@ -29,7 +29,6 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -42,7 +41,6 @@
 import retrofit.converter.JacksonConverter;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.graphite.enabled")
 @ComponentScan({"com.netflix.kayenta.graphite"})
 @Slf4j

diff --git a/kayenta-graphite/src/main/resources/META-INF/spring.factories b/kayenta-graphite/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.graphite.config.GraphiteConfiguration
diff --git a/...nta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java b/...nta-influxdb/src/main/java/com/netflix/kayenta/influxdb/config/InfluxDbConfiguration.java
@@ -21,7 +21,6 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -41,7 +40,6 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.influxdb.enabled")
 @ComponentScan({"com.netflix.kayenta.influxdb"})
 @Slf4j

diff --git a/kayenta-influxdb/src/main/resources/META-INF/spring.factories b/kayenta-influxdb/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.influxdb.config.InfluxDbConfiguration
diff --git a/kayenta-judge/src/main/resources/META-INF/spring.factories b/kayenta-judge/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.judge.config.NetflixJudgeConfiguration,\
+com.netflix.kayenta.judge.config.RemoteJudgeConfiguration
diff --git a/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/config/NetflixJudgeConfiguration.java b/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/config/NetflixJudgeConfiguration.java
@@ -25,18 +25,14 @@
 import com.netflix.kayenta.storage.StorageServiceRepository;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@EnableConfigurationProperties
 @ComponentScan({
-  "com.netflix.kayenta.judge",
-  "com.netflix.kayenta.judge.config"
+  "com.netflix.kayenta.judge"
 })
-
 public class NetflixJudgeConfiguration {
 
   @Bean

diff --git a/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/config/RemoteJudgeConfiguration.java b/kayenta-judge/src/main/scala/com/netflix/kayenta/judge/config/RemoteJudgeConfiguration.java
@@ -18,18 +18,10 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-@EnableConfigurationProperties
-@ComponentScan({
-  "com.netflix.kayenta.judge",
-  "com.netflix.kayenta.judge.config"
-})
-
 @ConditionalOnProperty("kayenta.remote-judge.enabled")
 public class RemoteJudgeConfiguration {
 

diff --git a/...lic-insights/src/main/java/com/netflix/kayenta/newrelic/config/NewRelicConfiguration.java b/...lic-insights/src/main/java/com/netflix/kayenta/newrelic/config/NewRelicConfiguration.java
@@ -32,15 +32,13 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.CollectionUtils;
 import retrofit.converter.JacksonConverter;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.newrelic.enabled")
 @ComponentScan({"com.netflix.kayenta.newrelic"})
 @Slf4j

diff --git a/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories b/kayenta-newrelic-insights/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.newrelic.config.NewRelicConfiguration
diff --git a/...-configbin/src/main/java/com/netflix/kayenta/configbin/config/ConfigBinConfiguration.java b/...-configbin/src/main/java/com/netflix/kayenta/configbin/config/ConfigBinConfiguration.java
@@ -28,7 +28,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -37,7 +36,6 @@
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.configbin.enabled")
 @ComponentScan({"com.netflix.kayenta.configbin"})
 @Slf4j

diff --git a/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-configbin/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.configbin.config.ConfigBinConfiguration
diff --git a/...jectstore-memory/src/main/java/com/netflix/kayenta/memory/config/MemoryConfiguration.java b/...jectstore-memory/src/main/java/com/netflix/kayenta/memory/config/MemoryConfiguration.java
@@ -26,7 +26,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -37,7 +36,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.memory.enabled")
 @ComponentScan({"com.netflix.kayenta.memory"})
 @Slf4j

diff --git a/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories b/kayenta-objectstore-memory/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.memory.config.MemoryConfiguration
diff --git a/kayenta-orca/src/main/java/com/netflix/kayenta/config/OrcaConfiguration.java b/kayenta-orca/src/main/java/com/netflix/kayenta/config/OrcaConfiguration.java
@@ -24,7 +24,6 @@
 import com.netflix.spinnaker.orca.pipeline.util.StageNavigator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.*;
 
 import java.net.InetAddress;
@@ -39,7 +38,6 @@
   RestrictExecutionDuringTimeWindow.class,
   StageNavigator.class,
 })
-@EnableConfigurationProperties
 @ComponentScan({
   "com.netflix.kayenta.orca",
   "com.netflix.spinnaker.orca.pipeline",

diff --git a/kayenta-orca/src/main/resources/META-INF/spring.factories b/kayenta-orca/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.config.OrcaConfiguration
diff --git a/...ometheus/src/main/java/com/netflix/kayenta/prometheus/config/PrometheusConfiguration.java b/...ometheus/src/main/java/com/netflix/kayenta/prometheus/config/PrometheusConfiguration.java
@@ -28,7 +28,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -38,7 +37,6 @@
 import java.util.List;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.prometheus.enabled")
 @ComponentScan({"com.netflix.kayenta.prometheus"})
 @Slf4j

diff --git a/kayenta-prometheus/src/main/resources/META-INF/spring.factories b/kayenta-prometheus/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.prometheus.config.PrometheusConfiguration
diff --git a/kayenta-s3/src/main/resources/META-INF/spring.factories b/kayenta-s3/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.s3.config.S3Configuration
diff --git a/...nta-signalfx/src/main/java/com/netflix/kayenta/signalfx/config/SignalFxConfiguration.java b/...nta-signalfx/src/main/java/com/netflix/kayenta/signalfx/config/SignalFxConfiguration.java
@@ -31,7 +31,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
@@ -43,7 +42,6 @@
 import java.util.stream.Collectors;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.signalfx.enabled")
 @ComponentScan({"com.netflix.kayenta.signalfx"})
 @Slf4j

diff --git a/kayenta-signalfx/src/main/resources/META-INF/spring.factories b/kayenta-signalfx/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.signalfx.config.SignalFxConfiguration
diff --git a/...driver/src/main/java/com/netflix/kayenta/stackdriver/config/StackdriverConfiguration.java b/...driver/src/main/java/com/netflix/kayenta/stackdriver/config/StackdriverConfiguration.java
@@ -24,14 +24,12 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 @Configuration
-@EnableConfigurationProperties
 @ConditionalOnProperty("kayenta.stackdriver.enabled")
 @ComponentScan({"com.netflix.kayenta.stackdriver"})
 @Slf4j

diff --git a/kayenta-stackdriver/src/main/resources/META-INF/spring.factories b/kayenta-stackdriver/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.netflix.kayenta.stackdriver.config.StackdriverConfiguration