Get atlas metrics service working against updated Atlas. (#29)

Add 'node' scope type to atlas canary scope. Drop stupidPretendScheduler from orca lib test in favor of @EnableScheduling.
spinnaker · May 29, 2017 · 4ad0641 · 4ad0641
1 parent 79155d1
commit 4ad0641
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 51 deletions.
diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/canary/AtlasCanaryScope.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/canary/AtlasCanaryScope.java
@@ -34,11 +34,11 @@ public class AtlasCanaryScope extends CanaryScope {
   public String cq() {
     switch (type) {
       case "application":
-        return ":list,(,nf.app," + scope + ",:eq,:cq,),:each";
       case "cluster":
-        return ":list,(,nf.cluster," + scope + ",:eq,:cq,),:each";
+      case "node":
+        return ":list,(,nf." + type + "," + scope + ",:eq,:cq,),:each";
       default:
-        throw new IllegalArgumentException("Scope type is unknown: " + scope);
+        throw new IllegalArgumentException("Scope type '" + type + "' is unknown: scope=" + scope);
     }
   }
 }
diff --git a/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/controllers/AtlasFetchController.java b/kayenta-atlas/src/main/java/com/netflix/kayenta/atlas/controllers/AtlasFetchController.java
@@ -63,8 +63,8 @@ public String queryMetrics(@RequestParam(required = false) final String metricsA
                              @ApiParam(defaultValue = "cpu") @RequestParam String metricSetName,
                              @ApiParam(defaultValue = "cluster") @RequestParam String type,
                              @RequestParam String scope,
-                             @ApiParam(defaultValue = "0") @RequestParam Long start,
-                             @ApiParam(defaultValue = "6000000") @RequestParam Long end,
+                             @ApiParam(defaultValue = "0") @RequestParam String start,
+                             @ApiParam(defaultValue = "6000000") @RequestParam String end,
                              @ApiParam(defaultValue = "PT1M") @RequestParam String step) throws IOException {
     String resolvedMetricsAccountName = CredentialsHelper.resolveAccountByNameOrType(metricsAccountName,
                                                                                      AccountCredentials.Type.METRICS_STORE,

diff --git a/kayenta-atlas/src/test/java/com/netflix/kayenta/atlas/IntegrationTest.java b/kayenta-atlas/src/test/java/com/netflix/kayenta/atlas/IntegrationTest.java
@@ -69,8 +69,8 @@ private CanaryConfig getConfig(String filename) throws IOException {
 
     private CanaryMetricConfigWithResults queryMetric(CanaryMetricConfig metric, AtlasCanaryScope scope) {
         long step = Duration.parse(scope.getStep()).toMillis();
-        long start = scope.getStart() / step * step;
-        long end = scope.getEnd() / step * step;
+        long start = Long.parseLong(scope.getStart()) / step * step;
+        long end = Long.parseLong(scope.getEnd()) / step * step;
         long count = (end - start) / step;
 
         AtlasMetricSetQuery atlasMetricSetQuery = (AtlasMetricSetQuery)metric.getQuery();
@@ -99,14 +99,14 @@ public void loadConfig() throws Exception {
         AtlasCanaryScope experiment = new AtlasCanaryScope();
         experiment.setType("application");
         experiment.setScope("app_leo");
-        experiment.setStart(0L);
-        experiment.setEnd(600000L);
+        experiment.setStart("0");
+        experiment.setEnd("600000");
         experiment.setStep("PT1M");
         AtlasCanaryScope control = new AtlasCanaryScope();
         control.setType("application");
         control.setScope("app_lep");
-        control.setStart(0L);
-        control.setEnd(600000L);
+        control.setStart("0");
+        control.setEnd("600000");
         control.setStep("PT1M");
 
         //   3.  for each metric in the config:

diff --git a/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryScope.java b/kayenta-core/src/main/java/com/netflix/kayenta/canary/CanaryScope.java
@@ -26,10 +26,10 @@ public class CanaryScope {
     protected String scope;
 
     @NotNull
-    protected Long start;
+    protected String start;
 
     @NotNull
-    protected Long end;
+    protected String end;
 
     @NotNull
     protected String step;

diff --git a/kayenta-orca/src/test/java/com/netflix/kayenta/orca/lib/OrcaAsLibIntegrationTest.java b/kayenta-orca/src/test/java/com/netflix/kayenta/orca/lib/OrcaAsLibIntegrationTest.java
@@ -39,27 +39,24 @@
 import com.netflix.spinnaker.orca.q.PipelineBuilderKt;
 import com.netflix.spinnaker.orca.q.Queue;
 import com.netflix.spinnaker.orca.q.QueueExecutionRunner;
-import com.netflix.spinnaker.orca.q.QueueProcessor;
 import com.netflix.spinnaker.orca.test.redis.EmbeddedRedisConfiguration;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import javax.annotation.PostConstruct;
 import java.time.Duration;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.OUT_OF_SERVICE;
 import static com.netflix.appinfo.InstanceInfo.InstanceStatus.STARTING;
@@ -147,7 +144,9 @@ public void canRunASimplePipeline() {
   RestrictExecutionDuringTimeWindow.class
 })
 
+@EnableScheduling
 class TestConfig {
+
   @Bean
   Registry registry() {
     return new NoopRegistry();
@@ -177,37 +176,6 @@ public String getType() {
     };
   }
 
-  @Bean
-  Object stupidPretendScheduler(QueueProcessor queueProcessor) {
-    return new DisposableBean() {
-      AtomicBoolean running = new AtomicBoolean(false);
-
-      @PostConstruct
-      void afterPropertiesSet() {
-        running.set(true);
-
-        new Thread(new Runnable() {
-          @Override
-          public void run() {
-            while (running.get()) {
-              queueProcessor.pollOnce();
-              try {
-                Thread.sleep(10);
-              } catch (InterruptedException e) {
-                e.printStackTrace();
-              }
-            }
-          }
-        }).start();
-      }
-
-      @Override
-      public void destroy() throws Exception {
-        running.set(false);
-      }
-    };
-  }
-
   @Bean
   String currentInstanceId() {
     return "localhost";

diff --git a/...src/main/java/com/netflix/kayenta/stackdriver/controllers/StackdriverFetchController.java b/...src/main/java/com/netflix/kayenta/stackdriver/controllers/StackdriverFetchController.java
@@ -82,8 +82,8 @@ public String queryMetrics(@RequestParam(required = false) final String metricsA
     if (metricsService.isPresent()) {
       StackdriverCanaryScope stackdriverCanaryScope = new StackdriverCanaryScope();
       stackdriverCanaryScope.setScope(scope);
-      stackdriverCanaryScope.setStart(startTimeMillis);
-      stackdriverCanaryScope.setEnd(endTimeMillis);
+      stackdriverCanaryScope.setStart(startTimeMillis + "");
+      stackdriverCanaryScope.setEnd(endTimeMillis + "");
       stackdriverCanaryScope.setIntervalStartTimeIso(intervalStartTimeIso);
       stackdriverCanaryScope.setIntervalEndTimeIso(intervalEndTimeIso);
       stackdriverCanaryScope.setStep(step);

diff --git a/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -97,7 +97,9 @@ public List<MetricSet> queryMetrics(String accountName,
 
     ListTimeSeriesResponse response = list.execute();
 
-    long elapsedSeconds = (stackdriverCanaryScope.getStart() - stackdriverCanaryScope.getEnd()) / 1000;
+    long startAsLong = Long.parseLong(stackdriverCanaryScope.getStart());
+    long endAsLong = Long.parseLong(stackdriverCanaryScope.getEnd());
+    long elapsedSeconds = (endAsLong - startAsLong) / 1000;
     long numIntervals = elapsedSeconds / alignmentPeriodSec;
     long remainder = elapsedSeconds % alignmentPeriodSec;