Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lwcapi: update /evaluate to accept events #1630

Merged
merged 1 commit into from
Mar 26, 2024
Merged

lwcapi: update /evaluate to accept events #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions atlas-lwcapi/src/main/scala/com/netflix/atlas/lwcapi/EvaluateApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
}
15 changes: 13 additions & 2 deletions atlas-lwcapi/src/test/scala/com/netflix/atlas/lwcapi/EvaluateApiSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -42,15 +45,23 @@ 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)
}
}

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)
}
Expand Down
Loading