[APM Datadog] return 429 specific error (#552)

hashicorp · Dec 15, 2021 · 16b121b · 16b121b
1 parent 6d4de1f
commit 16b121b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## UNRELEASED
 
 BUG FIXES:
+ * plugins/apm/datadog: Log the correct rate limit error message [[GH-552](https://github.com/hashicorp/nomad-autoscaler/pull/552)]
  * plugins/target/nomad: Reload status handlers on SIGHUP [[GH-554](https://github.com/hashicorp/nomad-autoscaler/pull/554)]
  * policy: Fixed an issue that could cause a panic if the policy content is not read in time [[GH-551](https://github.com/hashicorp/nomad-autoscaler/pull/551)]
 

diff --git a/plugins/builtin/apm/datadog/plugin/plugin.go b/plugins/builtin/apm/datadog/plugin/plugin.go
@@ -141,15 +141,14 @@ func (a *APMPlugin) QueryMultiple(q string, r sdk.TimeRange) ([]sdk.TimestampedM
 		Query(q).
 		Execute()
 	if err != nil {
+		if res.StatusCode == http.StatusTooManyRequests {
+			return nil,
+				fmt.Errorf("metric queries are ratelimited in current time period by datadog, resets in %s sec",
+					res.Header.Get(ratelimitResetHdr))
+		}
 		return nil, fmt.Errorf("error querying metrics from datadog: %v", err)
 	}
 
-	if res.StatusCode == http.StatusTooManyRequests {
-		return nil,
-			fmt.Errorf("metric queries are ratelimited in current time period by datadog, resets in %s sec",
-				res.Header.Get(ratelimitResetHdr))
-	}
-
 	series := queryResult.GetSeries()
 	if len(series) == 0 {
 		a.logger.Warn("empty time series response from datadog, try a wider query window")