From 80ed3f49574cc443b4270ccf179cb7bc1be65c29 Mon Sep 17 00:00:00 2001
From: brharrington <brharrington@gmail.com>
Date: Wed, 20 Nov 2024 13:31:32 -0600
Subject: [PATCH] eval: preserve step for event URIs (#1728)

It will be used with sampling operators.
---
 .../scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala    | 2 +-
 .../scala/com/netflix/atlas/lwcapi/ExpressionMetadata.scala    | 3 +--
 .../scala/com/netflix/atlas/lwcapi/SubscribeApiSuite.scala     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala b/atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala
index f6f688c9c..d05716a3c 100644
--- a/atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala
+++ b/atlas-eval/src/main/scala/com/netflix/atlas/eval/stream/EvaluatorImpl.scala
@@ -524,7 +524,7 @@ private[stream] abstract class EvaluatorImpl(
     dss.sources.asScala.flatMap { dataSource =>
       val (exprType, exprs) = interpreter.parseQuery(Uri(dataSource.uri))
       exprs.map { expr =>
-        val step = if (exprType.isTimeSeriesType) dataSource.step.toMillis else 0L
+        val step = dataSource.step.toMillis
         LwcExpression(expr.toString, exprType, step)
       }
     }.toSet
diff --git a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/ExpressionMetadata.scala b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/ExpressionMetadata.scala
index cbdaed881..d8f0e827a 100644
--- a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/ExpressionMetadata.scala
+++ b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/ExpressionMetadata.scala
@@ -40,8 +40,7 @@ case class ExpressionMetadata(
 object ExpressionMetadata {
 
   def apply(expression: String, exprType: ExprType, step: Long): ExpressionMetadata = {
-    val dfltStep = if (exprType.isTimeSeriesType) ApiSettings.defaultStep else 0L
-    val f = if (step > 0) step else dfltStep
+    val f = if (step > 0) step else ApiSettings.defaultStep
     new ExpressionMetadata(expression, exprType, f, computeId(expression, exprType, f))
   }
 
diff --git a/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/SubscribeApiSuite.scala b/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/SubscribeApiSuite.scala
index e74b63717..e5112e768 100644
--- a/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/SubscribeApiSuite.scala
+++ b/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/SubscribeApiSuite.scala
@@ -109,7 +109,7 @@ class SubscribeApiSuite extends MUnitRouteSuite {
         parseBatch(client.expectMessage()).foreach {
           case _: DiagnosticMessage   =>
           case sub: LwcSubscriptionV2 => subscriptions = sub :: subscriptions
-          case h: LwcHeartbeat        => assertEquals(h.step, 5000L)
+          case h: LwcHeartbeat        => assertEquals(h.step, 60000L)
           case v                      => throw new MatchError(v)
         }
       }