chart: more heatmap graph examples.

brharrington · Apr 28, 2023 · 7d4f98b · 7d4f98b
1 parent cdb2a93
commit 7d4f98b
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 4 deletions.
diff --git a/...t/src/test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_empty.png b/...t/src/test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_empty.png
diff --git a/...est/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_single_ptile.png b/...est/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_single_ptile.png
diff --git a/...c/test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_log.png b/...c/test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_log.png
diff --git a/...est/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_power2.png b/...est/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_power2.png
diff --git a/.../test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_sqrt.png b/.../test/resources/graphengine/DefaultGraphEngineSuite/dark_heatmap_timer_sqrt.png
diff --git a/...-chart/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_empty.png b/...-chart/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_empty.png
diff --git a/...src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_single_ptile.png b/...src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_single_ptile.png
diff --git a/...rt/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_log.png b/...rt/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_log.png
diff --git a/...src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_power2.png b/...src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_power2.png
diff --git a/...t/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_sqrt.png b/...t/src/test/resources/graphengine/DefaultGraphEngineSuite/heatmap_timer_sqrt.png
diff --git a/atlas-chart/src/test/resources/graphengine/data/heatmap_empty.json.gz b/atlas-chart/src/test/resources/graphengine/data/heatmap_empty.json.gz
diff --git a/atlas-chart/src/test/resources/graphengine/data/heatmap_single_ptile.json.gz b/atlas-chart/src/test/resources/graphengine/data/heatmap_single_ptile.json.gz
diff --git a/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala b/atlas-chart/src/test/scala/com/netflix/atlas/chart/PngGraphEngineSuite.scala
@@ -22,7 +22,6 @@ import java.time.ZoneId
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.time.temporal.ChronoUnit
-
 import com.netflix.atlas.chart.model.PlotBound.AutoData
 import com.netflix.atlas.chart.model.PlotBound.Explicit
 import com.netflix.atlas.chart.model._
@@ -151,8 +150,14 @@ abstract class PngGraphEngineSuite extends FunSuite {
   }
 
   def loadV2(resource: String): GraphDef = {
-    Using.resource(Streams.gzip(Streams.resource(resource))) { in =>
-      JsonCodec.decode(in)
+    if (resource.endsWith(".gz")) {
+      Using.resource(Streams.gzip(Streams.resource(resource))) { in =>
+        JsonCodec.decode(in)
+      }
+    } else {
+      Using.resource(Streams.resource(resource)) { in =>
+        JsonCodec.decode(in)
+      }
     }
   }
 
@@ -804,6 +809,27 @@ abstract class PngGraphEngineSuite extends FunSuite {
     check("heatmap_timer.png", graphDef)
   }
 
+  test("heatmap_timer_log") {
+    val graphDef = loadV2(s"$dataDir/heatmap_timer.json.gz").adjustPlots(
+      _.copy(scale = Scale.LOGARITHMIC)
+    )
+    check("heatmap_timer_log.png", graphDef)
+  }
+
+  test("heatmap_timer_power2") {
+    val graphDef = loadV2(s"$dataDir/heatmap_timer.json.gz").adjustPlots(
+      _.copy(scale = Scale.POWER_2)
+    )
+    check("heatmap_timer_power2.png", graphDef)
+  }
+
+  test("heatmap_timer_sqrt") {
+    val graphDef = loadV2(s"$dataDir/heatmap_timer.json.gz").adjustPlots(
+      _.copy(scale = Scale.SQRT)
+    )
+    check("heatmap_timer_sqrt.png", graphDef)
+  }
+
   test("heatmap_timer2") {
     val graphDef = loadV2(s"$dataDir/heatmap_timer2.json.gz")
     check("heatmap_timer2.png", graphDef)
@@ -880,10 +906,20 @@ abstract class PngGraphEngineSuite extends FunSuite {
     check("heatmap_timer_small.png", graphDef)
   }
 
+  test("heatmap_single_ptile") {
+    val graphDef = loadV2(s"$dataDir/heatmap_single_ptile.json.gz")
+    check("heatmap_single_ptile.png", graphDef)
+  }
+
   test("heatmap_dist") {
     val graphDef = loadV2(s"$dataDir/heatmap_dist.json.gz")
     check("heatmap_dist.png", graphDef)
   }
+
+  test("heatmap_empty") {
+    val graphDef = loadV2(s"$dataDir/heatmap_empty.json.gz")
+    check("heatmap_empty.png", graphDef)
+  }
 }
 
 case class GraphData(

diff --git a/atlas-eval/src/test/scala/com/netflix/atlas/eval/graph/GrapherSuite.scala b/atlas-eval/src/test/scala/com/netflix/atlas/eval/graph/GrapherSuite.scala
@@ -492,7 +492,7 @@ class GrapherSuite extends FunSuite {
   imageTest("heatmap params") {
     "/api/v1/graph?e=2012-01-01&q=name,sps,:eq,:sum,(,nf.cluster,),:by,:heatmap&heatmap_palette=greens&heatmap_scale=sqrt&heatmap_u=5&heatmap_label=foo"
   }
-  
+
   imageTest("named colors: blue with light theme") {
     "/api/v1/graph?e=2012-01-01&q=1,blue1,:color,1,blue2,:color,1,blue3,:color&stack=1&theme=light"
   }