From ef042e26ff364a17b1dc506d4114adc387cfeade Mon Sep 17 00:00:00 2001
From: Shlomo Daari <104773977+shlomodaari@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:10:52 -0700
Subject: [PATCH 1/2] fix conflict 1.33.x

---
 .../stackdriver/metrics/StackdriverMetricsService.java     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
index 8bf3ed93a..a8c2e672e 100644
--- a/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
+++ b/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -399,12 +399,6 @@ public List<MetricSet> queryMetrics(
               : 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 +430,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()

From 8e34ec7ca789dad86ed8b3d95400196b9696d925 Mon Sep 17 00:00:00 2001
From: Shlomo Daari <104773977+shlomodaari@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:07:15 -0700
Subject: [PATCH 2/2] Update StackdriverMetricsService.java

---
 .../kayenta/stackdriver/metrics/StackdriverMetricsService.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java b/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
index c6ec01ce0..17f10d14d 100644
--- a/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
+++ b/kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java
@@ -398,7 +398,6 @@ public List<MetricSet> queryMetrics(
               ? Instant.parse(points.get(points.size() - 1).getInterval().getEndTime())
               : stackdriverCanaryScope.getEnd();
 
-
       List<Double> pointValues;
 
       if (points.isEmpty()) {