refactor(core): Remove InstrumentedExecutionRepository for kork's Ins…

…trumentedProxy (#3571)

Co-authored-by: Mark Vulfson <mvulfson@netflix.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

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

@@ -63,10 +63,9 @@ class DualExecutionRepository(
 
     val findExecutionRepositoryByClass = { className: String ->
       val repositoryClass = Class.forName(className)
-      allRepositories.find { repo ->
-        repositoryClass.isInstance(repo) ||
-          (repo is DelegatingExecutionRepository<*> && repositoryClass.isInstance(repo.getDelegate()))
-      } ?: throw IllegalStateException("No ExecutionRepository bean of class $className found")
+      allRepositories
+        .find { repositoryClass.isInstance(it) }
+        ?: throw IllegalStateException("No ExecutionRepository bean of class $className found")
     }
 
     val findExecutionRepository = { beanName: String, beanClass: String ->

orca-redis/src/main/java/com/netflix/spinnaker/orca/config/RedisConfiguration.java

@@ -18,12 +18,13 @@
 import com.netflix.spectator.api.Registry;
 import com.netflix.spinnaker.kork.jedis.JedisClientConfiguration;
 import com.netflix.spinnaker.kork.jedis.RedisClientSelector;
+import com.netflix.spinnaker.kork.telemetry.InstrumentedProxy;
 import com.netflix.spinnaker.orca.notifications.NotificationClusterLock;
 import com.netflix.spinnaker.orca.notifications.RedisClusterNotificationClusterLock;
 import com.netflix.spinnaker.orca.notifications.RedisNotificationClusterLock;
 import com.netflix.spinnaker.orca.pipeline.persistence.ExecutionRepository;
 import com.netflix.spinnaker.orca.pipeline.persistence.jedis.RedisExecutionRepository;
-import com.netflix.spinnaker.orca.telemetry.RedisInstrumentedExecutionRepository;
+import java.util.Collections;
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,15 +55,16 @@ public ExecutionRepository redisExecutionRepository(
       @Qualifier("queryByAppScheduler") Scheduler queryByAppScheduler,
       @Value("${chunk-size.execution-repository:75}") Integer threadPoolChunkSize,
       @Value("${keiko.queue.redis.queue-name:}") String bufferedPrefix) {
-    return new RedisInstrumentedExecutionRepository(
+    ExecutionRepository repository =
         new RedisExecutionRepository(
             registry,
             redisClientSelector,
             queryAllScheduler,
             queryByAppScheduler,
             threadPoolChunkSize,
-            bufferedPrefix),
-        registry);
+            bufferedPrefix);
+    return InstrumentedProxy.proxy(
+        registry, repository, "redis.executionRepository", Collections.emptyMap());
   }
 
   @Bean