chore(sql): replace SqlInstrumentedExecutionRepository

with kork-sql's automagic InstrumentedProxy

orca-core/orca-core.gradle

@@ -30,6 +30,7 @@ dependencies {
   api("com.netflix.spinnaker.kork:kork-exceptions")
   api("com.netflix.spinnaker.kork:kork-expressions")
   api("com.netflix.spinnaker.kork:kork-plugins")
+  api("com.netflix.spinnaker.kork:kork-telemetry")
   api("io.reactivex:rxjava")
 
   implementation(project(":orca-api"))

orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/ExecutionRepository.java

@@ -17,6 +17,7 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.netflix.spinnaker.kork.telemetry.Instrumented;
 import com.netflix.spinnaker.orca.ExecutionStatus;
 import com.netflix.spinnaker.orca.pipeline.model.Execution;
 import com.netflix.spinnaker.orca.pipeline.model.Execution.ExecutionType;
@@ -38,6 +39,7 @@ public interface ExecutionRepository {
 
   void addStage(@Nonnull Stage stage);
 
+  @Instrumented(metricName = "cancelNullReason")
   void cancel(@Nonnull ExecutionType type, @Nonnull String id);
 
   void cancel(
@@ -48,6 +50,7 @@ void cancel(
 
   void pause(@Nonnull ExecutionType type, @Nonnull String id, @Nullable String user);
 
+  @Instrumented(metricName = "resumeNoIgnore")
   void resume(@Nonnull ExecutionType type, @Nonnull String id, @Nullable String user);
 
   void resume(
@@ -61,15 +64,18 @@ void resume(
   void updateStatus(ExecutionType type, @Nonnull String id, @Nonnull ExecutionStatus status);
 
   @Nonnull
+  @Instrumented(metricName = "retrieveById")
   Execution retrieve(@Nonnull ExecutionType type, @Nonnull String id)
       throws ExecutionNotFoundException;
 
   void delete(@Nonnull ExecutionType type, @Nonnull String id);
 
   @Nonnull
+  @Instrumented(metricName = "retrieveByType")
   Observable<Execution> retrieve(@Nonnull ExecutionType type);
 
   @Nonnull
+  @Instrumented(metricName = "retrieveByCriteria")
   Observable<Execution> retrieve(@Nonnull ExecutionType type, @Nonnull ExecutionCriteria criteria);
 
   @Nonnull
@@ -110,6 +116,7 @@ List<Execution> retrieveAllPipelinesForPipelineConfigIdsBetweenBuildTimeBoundary
 
   @Deprecated // Use the non-rx interface instead
   @Nonnull
+  @Instrumented(metricName = "retrieveOrchestrationsForApplicationSortedAsc")
   Observable<Execution> retrieveOrchestrationsForApplication(
       @Nonnull String application, @Nonnull ExecutionCriteria criteria);
 
@@ -141,6 +148,7 @@ Execution retrievePipelineForCorrelationId(@Nonnull String correlationId)
   List<String> retrieveAllApplicationNames(@Nullable ExecutionType executionType);
 
   @Nonnull
+  @Instrumented(metricName = "retrieveAllApplicationNamesWithMinExecutions")
   List<String> retrieveAllApplicationNames(
       @Nullable ExecutionType executionType, int minExecutions);
 

orca-sql/orca-sql.gradle

@@ -23,6 +23,7 @@ dependencies {
   implementation(project(":orca-queue"))
 
   implementation("com.netflix.spinnaker.kork:kork-sql")
+  implementation("com.netflix.spinnaker.kork:kork-telemetry")
   implementation("com.netflix.spectator:spectator-api")
   implementation("com.netflix.spinnaker.keiko:keiko-core:$keikoVersion")
   implementation("com.netflix.spinnaker.kork:kork-core")

orca-sql/src/main/kotlin/com/netflix/spinnaker/config/SqlConfiguration.kt

@@ -20,13 +20,14 @@ import com.netflix.spectator.api.Registry
 import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import com.netflix.spinnaker.kork.sql.config.DefaultSqlConfiguration
 import com.netflix.spinnaker.kork.sql.config.SqlProperties
+import com.netflix.spinnaker.kork.telemetry.InstrumentedProxy
 import com.netflix.spinnaker.orca.notifications.NotificationClusterLock
 import com.netflix.spinnaker.orca.notifications.SqlNotificationClusterLock
+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.SqlExecutionRepository
-import com.netflix.spinnaker.orca.sql.telemetry.SqlInstrumentedExecutionRepository
 import liquibase.integration.spring.SpringLiquibase
 import org.jooq.DSLContext
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
@@ -58,17 +59,16 @@ class SqlConfiguration {
     properties: SqlProperties,
     orcaSqlProperties: OrcaSqlProperties
   ) =
-    SqlInstrumentedExecutionRepository(
-      SqlExecutionRepository(
-        orcaSqlProperties.partitionName,
-        dsl,
-        mapper,
-        properties.retries.transactions,
-        orcaSqlProperties.batchReadSize,
-        orcaSqlProperties.stageReadSize
-      ),
-      registry
-    )
+    SqlExecutionRepository(
+      orcaSqlProperties.partitionName,
+      dsl,
+      mapper,
+      properties.retries.transactions,
+      orcaSqlProperties.batchReadSize,
+      orcaSqlProperties.stageReadSize
+    ).let {
+      InstrumentedProxy.proxy(registry, it, "sql.executionRepository", mapOf()) as ExecutionRepository
+    }
 
   @Bean fun sqlHealthcheckActivator(dsl: DSLContext, registry: Registry) =
     SqlHealthcheckActivator(dsl, registry)