fix(mergify): fix conflicts in cherry-pick

spinnaker · Aug 8, 2024 · bca20e4 · bca20e4
1 parent 04cb709
commit bca20e4
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/...iver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -398,13 +398,6 @@ public List<MetricSet> queryMetrics(
  ? Instant.parse(points.get(points.size() - 1).getInterval().getEndTime())
  : stackdriverCanaryScope.getEnd();
 
- // TODO(duftler): What if there are no data points?
-<<<<<<< HEAD
- List<Double> pointValues =
- points.stream()
- .map(point -> point.getValue().getDoubleValue())
- .collect(Collectors.toList());
-=======
  List<Double> pointValues;
 
  if (points.isEmpty()) {
@@ -436,7 +429,6 @@ public List<MetricSet> queryMetrics(
  pointValues = Collections.emptyList(); // Handle null valueType case as well
  }
  }
->>>>>>> 6684f9dd (fix(stackdriver): handle null timeSeries and empty points (#1047))
 
  MetricSet.MetricSetBuilder metricSetBuilder =
  MetricSet.builder()