lwcapi: always use v2 subscription message (#1726)

Client usage is all updated at this point.
Netflix · Nov 20, 2024 · 36ebeaf · 36ebeaf
1 parent 80490bc
commit 36ebeaf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/SubscribeApi.scala
@@ -15,7 +15,6 @@
  */
 package com.netflix.atlas.lwcapi
 
-import com.netflix.atlas.eval.model.ExprType
 import org.apache.pekko.NotUsed
 import org.apache.pekko.http.scaladsl.model.ws.BinaryMessage
 import org.apache.pekko.http.scaladsl.model.ws.Message
@@ -31,7 +30,6 @@ import org.apache.pekko.util.ByteString
 import com.netflix.atlas.eval.model.LwcDataExpr
 import com.netflix.atlas.eval.model.LwcHeartbeat
 import com.netflix.atlas.eval.model.LwcMessages
-import com.netflix.atlas.eval.model.LwcSubscription
 import com.netflix.atlas.eval.model.LwcSubscriptionV2
 import com.netflix.atlas.json.JsonSupport
 import com.netflix.atlas.pekko.CustomDirectives.*
@@ -209,13 +207,7 @@ class SubscribeApi(
         val subMessages = addedSubs.map { sub =>
           val meta = sub.metadata
           val exprInfo = LwcDataExpr(meta.id, meta.expression, meta.frequency)
-          if (expr.exprType == ExprType.TIME_SERIES) {
-            // For backwards compatibility for older versions of eval library, use v1
-            // subscription response when it is a time series type
-            LwcSubscription(expr.expression, List(exprInfo))
-          } else {
-            LwcSubscriptionV2(expr.expression, expr.exprType, List(exprInfo))
-          }
+          LwcSubscriptionV2(expr.expression, expr.exprType, List(exprInfo))
         }
         messages ++= subMessages
 

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
@@ -25,7 +25,6 @@ import com.netflix.atlas.eval.model.LwcEvent
 import com.netflix.atlas.eval.model.LwcExpression
 import com.netflix.atlas.eval.model.LwcHeartbeat
 import com.netflix.atlas.eval.model.LwcMessages
-import com.netflix.atlas.eval.model.LwcSubscription
 import com.netflix.atlas.eval.model.LwcSubscriptionV2
 import com.netflix.atlas.json.Json
 import com.netflix.atlas.pekko.DiagnosticMessage
@@ -70,20 +69,20 @@ class SubscribeApiSuite extends MUnitRouteSuite {
       client.sendMessage(LwcMessages.encodeBatch(exprs, compress = true))
 
       // Look for subscription messages, one for sum and one for count
-      var subscriptions = List.empty[LwcSubscription]
+      var subscriptions = List.empty[LwcSubscriptionV2]
       while (subscriptions.size < 2) {
         parseBatch(client.expectMessage()).foreach {
-          case _: DiagnosticMessage =>
-          case sub: LwcSubscription => subscriptions = sub :: subscriptions
-          case h: LwcHeartbeat      => assertEquals(h.step, 60000L)
-          case v                    => throw new MatchError(v)
+          case _: DiagnosticMessage   =>
+          case sub: LwcSubscriptionV2 => subscriptions = sub :: subscriptions
+          case h: LwcHeartbeat        => assertEquals(h.step, 60000L)
+          case v                      => throw new MatchError(v)
         }
       }
 
       // Verify subscription is in the manager, push a message to the queue check that it
       // is received by the client
-      assertEquals(subscriptions.flatMap(_.metrics).size, 2)
-      subscriptions.flatMap(_.metrics).foreach { m =>
+      assertEquals(subscriptions.flatMap(_.subExprs).size, 2)
+      subscriptions.flatMap(_.subExprs).foreach { m =>
         val tags = Map("name" -> "disk")
         val datapoint = LwcDatapoint(60000, m.id, tags, 42.0)
         val handlers = sm.handlersForSubscription(m.id)