fix(metrics): revert metric names to pre-Java (#5936) (#5941)

* fix(metrics): revert metric names to pre-Java closing spinnaker/spinnaker#6821

* fix(metrics): remove unused extension

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 70f6177)

Co-authored-by: Matt <[email protected]>

clouddriver-core/src/main/java/com/netflix/spinnaker/clouddriver/cache/MetricInstrumentation.java

@@ -43,7 +43,7 @@ private static String stripPackageName(String className) {
 
   private static String agentName(Agent agent) {
     String simpleProviderName = stripPackageName(agent.getProviderName());
-    return String.format("%s/%s", simpleProviderName, agent.getProviderName());
+    return String.format("%s/%s", simpleProviderName, agent.getAgentType());
   }
 
   @Override

clouddriver-core/src/test/java/com/netflix/spinnaker/clouddriver/cache/MetricInstrumentationTest.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright 2023 JPMorgan Chase & Co.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.netflix.spinnaker.clouddriver.cache;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.netflix.spectator.api.DefaultRegistry;
+import com.netflix.spectator.api.Id;
+import com.netflix.spectator.api.Registry;
+import com.netflix.spectator.api.Timer;
+import com.netflix.spinnaker.cats.agent.Agent;
+import com.netflix.spinnaker.cats.agent.AgentDataType;
+import com.netflix.spinnaker.cats.agent.CacheResult;
+import com.netflix.spinnaker.cats.agent.CachingAgent;
+import com.netflix.spinnaker.cats.provider.ProviderCache;
+import java.util.Collection;
+import java.util.List;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class MetricInstrumentationTest {
+
+  private Registry registry;
+
+  private MetricInstrumentation metricInstrumentation;
+
+  @BeforeEach
+  void setup() {
+    registry = new DefaultRegistry();
+    metricInstrumentation = new MetricInstrumentation(registry);
+  }
+
+  @Test
+  void test_executionCompleted_hasExpectedMetricLabels() {
+    // given
+    String agentType = "test-account-bob/us-east-1/TestCachingAgent";
+    String provider = "io.spinnaker.clouddriver.test.TestProvider";
+
+    Agent agent =
+        new CachingAgent() {
+          @Override
+          public Collection<AgentDataType> getProvidedDataTypes() {
+            return List.of();
+          }
+
+          @Override
+          public CacheResult loadData(ProviderCache providerCache) {
+            return null;
+          }
+
+          @Override
+          public String getAgentType() {
+            return agentType;
+          }
+
+          @Override
+          public String getProviderName() {
+            return provider;
+          }
+        };
+
+    Id expectedId =
+        registry
+            .createId("executionTime")
+            .withTag("className", MetricInstrumentation.class.getSimpleName())
+            .withTag("agent", String.format("TestProvider/%s", agentType))
+            .withTag("success", true);
+
+    // when
+    metricInstrumentation.executionCompleted(agent, 500L);
+
+    // then
+    Timer timer = registry.timer(expectedId);
+    assertEquals(expectedId, timer.id());
+  }
+}