fix(sql): Create SqlActiveExecutionsMonitor via autoconfiguration ins…

…tead of @component (spinnaker#3861) When this bean is created via @component it fails to find the qualifier bean sqlExecutionRepository when qos is disabled. I can not say I really understand why. Now, the qualifier bean sqlExecutionRepository is found regardless of qos enabled/disabled.
Kaixiang-AWS · Aug 13, 2020 · 03cddba · 03cddba
1 parent 03bb515
commit 03cddba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt b/orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt
@@ -28,11 +28,14 @@ import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository
 import com.netflix.spinnaker.orca.sql.SpringLiquibaseProxy
 import com.netflix.spinnaker.orca.sql.SqlHealthIndicator
 import com.netflix.spinnaker.orca.sql.SqlHealthcheckActivator
+import com.netflix.spinnaker.orca.sql.pipeline.persistence.ExecutionStatisticsRepository
 import com.netflix.spinnaker.orca.sql.pipeline.persistence.SqlExecutionRepository
+import com.netflix.spinnaker.orca.sql.telemetry.SqlActiveExecutionsMonitor
 import java.time.Clock
 import java.util.Optional
 import liquibase.integration.spring.SpringLiquibase
 import org.jooq.DSLContext
+import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -98,6 +101,15 @@ class SqlConfiguration {
       InstrumentedProxy.proxy(registry, it, "sql.executions", mapOf(Pair("repository", "secondary"))) as ExecutionRepository
     }
 
+  @ConditionalOnProperty("monitor.active-executions.redis", havingValue = "false")
+  @Bean
+  fun sqlActiveExecutionsMonitor(
+    @Qualifier("sqlExecutionRepository") executionRepository: ExecutionStatisticsRepository,
+    registry: Registry,
+    @Value("\${monitor.active-executions.refresh.frequency.ms:60000}") refreshFrequencyMs: Long
+  ) =
+    SqlActiveExecutionsMonitor(executionRepository, registry, refreshFrequencyMs)
+
   @Bean
   fun sqlHealthcheckActivator(dsl: DSLContext, registry: Registry) =
     SqlHealthcheckActivator(dsl, registry)

diff --git a/...ql/src/main/kotlin/com/netflix/spinnaker/orca/sql/telemetry/SqlActiveExecutionsMonitor.kt b/...ql/src/main/kotlin/com/netflix/spinnaker/orca/sql/telemetry/SqlActiveExecutionsMonitor.kt
@@ -23,17 +23,11 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Qualifier
-import org.springframework.beans.factory.annotation.Value
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
-import org.springframework.stereotype.Component
 
-@Component
-@ConditionalOnProperty("monitor.active-executions.redis", havingValue = "false")
 class SqlActiveExecutionsMonitor(
-  @Qualifier("sqlExecutionRepository") private val executionRepository: ExecutionStatisticsRepository,
+  private val executionRepository: ExecutionStatisticsRepository,
   registry: Registry,
-  @Value("\${monitor.active-executions.refresh.frequency.ms:60000}") refreshFrequencyMs: Long
+  refreshFrequencyMs: Long
 ) {
 
   private val log = LoggerFactory.getLogger(javaClass)