fix(stackdriver): handle null timeSeries and empty points #1047
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This should fix this issue: spinnaker/spinnaker#6968 |
edgarulg
approved these changes
Aug 7, 2024
link108
approved these changes
Aug 8, 2024
|
@Mergifyio backport release-1.32.x release-1.33.x release-1.34.x release-1.28.x |
✅ Backports have been created
|
mergify bot
pushed a commit
that referenced
this pull request
Aug 8, 2024
(cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java
mergify bot
pushed a commit
that referenced
this pull request
Aug 8, 2024
(cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java
mergify bot
pushed a commit
that referenced
this pull request
Aug 8, 2024
(cherry picked from commit 6684f9d)
This was referenced Aug 8, 2024
mergify bot
pushed a commit
that referenced
this pull request
Aug 8, 2024
(cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java
edgarulg
pushed a commit
that referenced
this pull request
Aug 8, 2024
edgarulg
added a commit
that referenced
this pull request
Aug 8, 2024
…1047) (#1051) * fix(stackdriver): handle null timeSeries and empty points (#1047) (cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java * fix(mergify): fix conflicts in cherry-pick --------- Co-authored-by: Shlomo Daari <104773977+shlomodaari@users.noreply.github.com> Co-authored-by: Edgar Garcia <edgar.garcia@harness.io>
edgarulg
added a commit
that referenced
this pull request
Aug 8, 2024
…1047) (#1048) * fix(stackdriver): handle null timeSeries and empty points (#1047) (cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java * fix(mergify): fix conflicts in cherry-pick --------- Co-authored-by: Shlomo Daari <104773977+shlomodaari@users.noreply.github.com> Co-authored-by: Edgar Garcia <edgar.garcia@harness.io>
edgarulg
added a commit
that referenced
this pull request
Aug 13, 2024
…1047) (#1049) * fix(stackdriver): handle null timeSeries and empty points (#1047) (cherry picked from commit 6684f9d) # Conflicts: # kayenta-stackdriver/src/main/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsService.java # kayenta-stackdriver/src/test/java/com/netflix/kayenta/stackdriver/metrics/StackdriverMetricsServiceTest.java * fix(mergify): fix conflicts in cherry-pick * fix(stackdrive): add mockito for tests --------- Co-authored-by: Shlomo Daari <104773977+shlomodaari@users.noreply.github.com> Co-authored-by: Edgar Garcia <edgar.garcia@harness.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adding an if statement to check if timeSeries is null and if the points are empty + tests