[OMON-655] Improve error message when dividing by 0 (#315)

awegrzyn · web-flow · commit b5744e074d5c · 2023-03-22T14:18:00.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 # Define project
 project(Monitoring
-  VERSION 3.15.2
+  VERSION 3.15.4
   DESCRIPTION "O2 Monitoring library"
   LANGUAGES CXX
 )
diff --git a/src/DerivedMetrics.cxx b/src/DerivedMetrics.cxx
@@ -80,7 +80,7 @@ bool DerivedMetrics::process(Metric& metric, DerivedMetricMode mode)
        int timestampCount = timestampDifference.count();
        // disallow dividing by 0
        if (timestampCount == 0) {
-         throw MonitoringException("DerivedMetrics", "Division by 0 when calculating rate for: " + metric.getFirstValue().first);
+         throw MonitoringException("DerivedMetrics", "Division by 0 when calculating rate for: " + metric.getName() + "/" + metric.getFirstValue().first);
        }
 
        auto current = metric.getFirstValue().second;

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ endif()`
`31`	`31`
`32`	`32`	`# Define project`
`33`	`33`	`project(Monitoring`
`34`		`- VERSION 3.15.2`
	`34`	`+ VERSION 3.15.4`
`35`	`35`	`DESCRIPTION "O2 Monitoring library"`
`36`	`36`	`LANGUAGES CXX`
`37`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ bool DerivedMetrics::process(Metric& metric, DerivedMetricMode mode)`
`80`	`80`	`int timestampCount = timestampDifference.count();`
`81`	`81`	`// disallow dividing by 0`
`82`	`82`	`if (timestampCount == 0) {`
`83`		`- throw MonitoringException("DerivedMetrics", "Division by 0 when calculating rate for: " + metric.getFirstValue().first);`
	`83`	`+ throw MonitoringException("DerivedMetrics", "Division by 0 when calculating rate for: " + metric.getName() + "/" + metric.getFirstValue().first);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`auto current = metric.getFirstValue().second;`