From 3501fc800544563d68d9990cec9df9c7ef686ab7 Mon Sep 17 00:00:00 2001 From: brharrington Date: Tue, 26 Mar 2024 14:16:59 -0500 Subject: [PATCH] lwcapi: update /evaluate to accept events (#1630) They will get passed through similar to diagnostic messages. --- .../com/netflix/atlas/lwcapi/EvaluateApi.scala | 5 +++++ .../netflix/atlas/lwcapi/EvaluateApiSuite.scala | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala index 96cc4359a..942ab8101 100644 --- a/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala +++ b/atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala @@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.netflix.atlas.core.util.SortedTagMap import com.netflix.atlas.eval.model.LwcDatapoint import com.netflix.atlas.eval.model.LwcDiagnosticMessage +import com.netflix.atlas.eval.model.LwcEvent import com.netflix.atlas.eval.util.SortedTagMapDeserializer import com.netflix.atlas.json.JsonSupport import com.netflix.atlas.pekko.CustomDirectives.* @@ -54,6 +55,9 @@ class EvaluateApi(registry: Registry, sm: StreamSubscriptionManager) } evaluate(addr, id, datapoints) } + req.events.groupBy(_.id).foreach { + case (id, events) => evaluate(addr, id, events) + } req.messages.groupBy(_.id).foreach { case (id, ms) => evaluate(addr, id, ms) } @@ -89,6 +93,7 @@ object EvaluateApi { case class EvaluateRequest( timestamp: Long, metrics: List[Item] = Nil, + events: List[LwcEvent] = Nil, messages: List[LwcDiagnosticMessage] = Nil ) extends JsonSupport } diff --git a/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala b/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala index 1681d865e..b87048f02 100644 --- a/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala +++ b/atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala @@ -15,10 +15,13 @@ */ package com.netflix.atlas.lwcapi +import com.fasterxml.jackson.databind.JsonNode import org.apache.pekko.http.scaladsl.model.StatusCodes import org.apache.pekko.http.scaladsl.testkit.RouteTestTimeout import com.netflix.atlas.core.util.SortedTagMap import com.netflix.atlas.eval.model.LwcDiagnosticMessage +import com.netflix.atlas.eval.model.LwcEvent +import com.netflix.atlas.json.Json import com.netflix.atlas.lwcapi.EvaluateApi.* import com.netflix.atlas.pekko.DiagnosticMessage import com.netflix.atlas.pekko.testkit.MUnitRouteSuite @@ -42,7 +45,15 @@ class EvaluateApiSuite extends MUnitRouteSuite { test("post metrics") { val metrics = List(Item("abc", SortedTagMap("a" -> "1"), 42.0)) - val json = EvaluateRequest(1234L, metrics, Nil).toJson + val json = EvaluateRequest(1234L, metrics, Nil, Nil).toJson + Post("/lwc/api/v1/evaluate", json) ~> endpoint.routes ~> check { + assertEquals(response.status, StatusCodes.OK) + } + } + + test("post events") { + val events = List(LwcEvent("abc", Json.decode[JsonNode]("42.0"))) + val json = EvaluateRequest(1234L, Nil, events, Nil).toJson Post("/lwc/api/v1/evaluate", json) ~> endpoint.routes ~> check { assertEquals(response.status, StatusCodes.OK) } @@ -50,7 +61,7 @@ class EvaluateApiSuite extends MUnitRouteSuite { test("post diagnostic message") { val msgs = List(LwcDiagnosticMessage("abc", DiagnosticMessage.error("bad expression"))) - val json = EvaluateRequest(1234L, Nil, msgs).toJson + val json = EvaluateRequest(1234L, Nil, Nil, msgs).toJson Post("/lwc/api/v1/evaluate", json) ~> endpoint.routes ~> check { assertEquals(response.status, StatusCodes.OK) }