Skip to content

Commit 14e6102

Browse files
authored
Merge pull request #97 from cisco-open/fix/master/summary-null-quantile-values
Fix summary quantile values
2 parents 408314b + 991b90d commit 14e6102

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/main/java/io/opentelemetry/contrib/generator/core/exception/GeneratorException.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,8 @@ public class GeneratorException extends RuntimeException {
2121
public GeneratorException(String message) {
2222
super(message);
2323
}
24+
25+
public GeneratorException(String message, Exception exception) {
26+
super(message, exception);
27+
}
2428
}

src/main/java/io/opentelemetry/contrib/generator/core/jel/ExpressionProcessor.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.opentelemetry.contrib.generator.core.jel;
22

3+
import io.opentelemetry.contrib.generator.core.exception.GeneratorException;
34
import jakarta.el.ELProcessor;
45
import jakarta.el.PropertyNotFoundException;
56

@@ -14,6 +15,8 @@ public <T> T eval(String expression) {
1415
return super.eval(expression);
1516
} catch (PropertyNotFoundException exception) {
1617
return (T) expression;
18+
} catch (Exception exception) {
19+
throw new GeneratorException("Failed to execute expression " + expression, exception);
1720
}
1821
}
1922
}

src/main/java/io/opentelemetry/contrib/generator/telemetry/metrics/SummaryGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private List<SummaryDataPoint.ValueAtQuantile> getQuantiles(List<Object> values,
9090
normalizedQuantile = eachQuantile > 1 ? eachQuantile/100 : eachQuantile;
9191
double valueAtQuantile = getValueAtPercentile(normalizedQuantile, vals);
9292
quantiles.add(SummaryDataPoint.ValueAtQuantile.newBuilder()
93-
.setQuantile(metricDefinition.getIsDouble() ? normalizedQuantile : eachQuantile)
93+
.setQuantile(normalizedQuantile)
9494
.setValue(valueAtQuantile)
9595
.build());
9696
}

0 commit comments

Comments
 (0)