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

Jump to bottom

core: sample-count is now stable #1625

Merged
merged 1 commit into from
Mar 11, 2024
Merged

core: sample-count is now stable #1625

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
2 changes: 0 additions & 2 deletions atlas-core/src/main/scala/com/netflix/atlas/core/model/MathVocabulary.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,8 +1249,6 @@ object MathVocabulary extends Vocabulary {

override def name: String = "sample-count"

override def isStable: Boolean = false

override def matches(stack: List[Any]): Boolean = {
stack match {
case DoubleType(_) :: DoubleType(_) :: (_: Query) :: _ => true
Expand Down
29 changes: 10 additions & 19 deletions atlas-core/src/test/scala/com/netflix/atlas/core/model/PercentilesSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.netflix.atlas.core.model
import java.util.concurrent.TimeUnit
import java.util.stream.Collectors
import com.netflix.atlas.core.stacklang.Interpreter
import com.netflix.atlas.core.util.Features
import com.netflix.spectator.api.Counter
import com.netflix.spectator.api.DefaultRegistry
import com.netflix.spectator.api.histogram.PercentileBuckets
Expand Down Expand Up @@ -50,14 +49,6 @@ class PercentilesSuite extends FunSuite {
expr.eval(context, input).data
}

def evalUnstable(str: String, input: List[TimeSeries]): List[TimeSeries] = {
val expr = interpreter.execute(str, Map.empty[String, Any], Features.UNSTABLE).stack match {
case (v: TimeSeriesExpr) :: _ => v
case _ => throw new IllegalArgumentException("invalid expr")
}
expr.eval(context, input).data
}

private val input100 = {
(0 until 100).map { i =>
val bucket = f"D${PercentileBuckets.indexOf(i)}%04X"
Expand Down Expand Up @@ -361,72 +352,72 @@ class PercentilesSuite extends FunSuite {
}

test("sample-count: distribution summary, range") {
val data = evalUnstable("name,test,:eq,50,100,:sample-count", input100)
val data = eval("name,test,:eq,50,100,:sample-count", input100)
assertEquals(data.size, 1)
val t = data.head
assertEqualsDouble(t.data(0L), 0.9, 1e-6)
}

test("sample-count: distribution summary, 0 - N") {
val data = evalUnstable("name,test,:eq,0,50,:sample-count", input100)
val data = eval("name,test,:eq,0,50,:sample-count", input100)
assertEquals(data.size, 1)
val t = data.head
assertEqualsDouble(t.data(0L), 0.85, 1e-6)
}

test("sample-count: distribution summary, N - Max") {
val data = evalUnstable("name,test,:eq,50,Infinity,:sample-count", input100)
val data = eval("name,test,:eq,50,Infinity,:sample-count", input100)
assertEquals(data.size, 1)
val t = data.head
assertEqualsDouble(t.data(0L), 0.9, 1e-6)
}

test("sample-count: distribution summary, Min >= Max") {
val e = intercept[IllegalArgumentException] {
evalUnstable("name,test,:eq,5,5,:sample-count", input100)
eval("name,test,:eq,5,5,:sample-count", input100)
}
assertEquals(e.getMessage, "requirement failed: min >= max (min=5.0, max=5.0)")
}

test("sample-count: distribution summary, Min < 0") {
val e = intercept[IllegalArgumentException] {
evalUnstable("name,test,:eq,-5,5,:sample-count", input100)
eval("name,test,:eq,-5,5,:sample-count", input100)
}
assertEquals(e.getMessage, "requirement failed: min < 0 (min=-5.0)")
}

test("sample-count: distribution summary, NaN - 100") {
val e = intercept[IllegalArgumentException] {
evalUnstable("name,test,:eq,NaN,100,:sample-count", input100)
eval("name,test,:eq,NaN,100,:sample-count", input100)
}
assertEquals(e.getMessage, "requirement failed: min >= max (min=NaN, max=100.0)")
}

test("sample-count: distribution summary, 0 - NaN") {
val e = intercept[IllegalArgumentException] {
evalUnstable("name,test,:eq,0,NaN,:sample-count", input100)
eval("name,test,:eq,0,NaN,:sample-count", input100)
}
assertEquals(e.getMessage, "requirement failed: min >= max (min=0.0, max=NaN)")
}

test("sample-count: distribution summary, NaN - NaN") {
val e = intercept[IllegalArgumentException] {
evalUnstable("name,test,:eq,NaN,NaN,:sample-count", input100)
eval("name,test,:eq,NaN,NaN,:sample-count", input100)
}
assertEquals(e.getMessage, "requirement failed: min >= max (min=NaN, max=NaN)")
}

test("sample-count: timer, range too high") {
// Timer range is in seconds, sample data is 0-100 ns
val data = evalUnstable("name,test,:eq,50,100,:sample-count", inputTimer100)
val data = eval("name,test,:eq,50,100,:sample-count", inputTimer100)
assertEquals(data.size, 1)
val t = data.head
assert(t.data(0L).isNaN)
}

test("sample-count: timer, range") {
// Timer range is in seconds, sample data is 0-100 ns
val data = evalUnstable("name,test,:eq,50e-9,100e-9,:sample-count", inputTimer100)
val data = eval("name,test,:eq,50e-9,100e-9,:sample-count", inputTimer100)
assertEquals(data.size, 1)
val t = data.head
assertEqualsDouble(t.data(0L), 0.9, 1e-6)
Expand Down
Loading