Use monitoring v1 API after fix in library

Author: hanneshayashi

cmd/monitoring.go

@@ -1,13 +1,10 @@
 package cmd
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log"
-	"net/http"
 	"slices"
 	"strings"
 	"time"
@@ -127,7 +124,7 @@ func processAlertPolicy(
 	ctx context.Context,
 	queryClient *monitoring.QueryClient,
 	metricClient *monitoring.MetricClient,
-	httpClient *http.Client,
+	monitoring_v1Service *monitoring_v1.Service,
 	alertPolicy *monitoringpb.AlertPolicy,
 	start *timestamppb.Timestamp,
 	end *timestamppb.Timestamp,
@@ -168,35 +165,23 @@ func processAlertPolicy(
 		}
 		if pql != nil {
 			seconds := pql.GetEvaluationInterval().GetSeconds()
-			// https://github.com/googleapis/google-api-go-client/issues/2304
-			body, err := json.Marshal(&monitoring_v1.QueryRangeRequest{
+			resp, err := monitoring_v1Service.Projects.Location.Prometheus.Api.V1.QueryRange(name, "global", &monitoring_v1.QueryRangeRequest{
 				Query: pql.GetQuery(),
 				Start: start.AsTime().Format(time.RFC3339),
 				End:   end.AsTime().Format(time.RFC3339),
 				Step:  fmt.Sprintf("%ds", seconds),
-			})
-			if err != nil {
-				policyOut.Error = err.Error()
-				continue
-			}
-			req, err := http.NewRequestWithContext(ctx, http.MethodPost, fmt.Sprintf("https://monitoring.googleapis.com/v1/projects/%s/location/global/prometheus/api/v1/query_range", projectId), bytes.NewReader(body))
-			if err != nil {
-				policyOut.Error = err.Error()
-				continue
-			}
-			resp, err := httpClient.Do(req)
+			}).Do()
 			if err != nil {
 				policyOut.Error = err.Error()
 				continue
 			}
-			defer resp.Body.Close()
-			res, err := io.ReadAll(resp.Body)
+			j, err := resp.MarshalJSON()
 			if err != nil {
 				policyOut.Error = err.Error()
 				continue
 			}
 			pqlResp := &pqlResponse{}
-			err = json.Unmarshal(res, pqlResp)
+			err = json.Unmarshal(j, pqlResp)
 			if err != nil {
 				policyOut.Error = err.Error()
 				continue

cmd/root.go

@@ -13,7 +13,7 @@ import (
 	"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
 	resourcemanager "cloud.google.com/go/resourcemanager/apiv3"
 	"github.com/spf13/cobra"
-	"golang.org/x/oauth2/google"
+	monitoring_v1 "google.golang.org/api/monitoring/v1"
 	"google.golang.org/api/option"
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
@@ -140,14 +140,9 @@ func Execute() {
 	if err != nil {
 		log.Fatalf("Failed to create folders client: %v", err)
 	}
-	// https://github.com/googleapis/google-api-go-client/issues/2304
-	// monitoring_v1Service, err := monitoring_v1.NewService(ctx, option.WithQuotaProject(quotaProject))
-	// if err != nil {
-	// 	log.Fatalf("Failed to create monitoring v1 client: %v", err)
-	// }
-	httpClient, err := google.DefaultClient(ctx, monitoring.DefaultAuthScopes()...)
+	monitoring_v1Service, err := monitoring_v1.NewService(ctx, option.WithQuotaProject(quotaProject))
 	if err != nil {
-		log.Fatalf("Failed to create default http client: %v", err)
+		log.Fatalf("Failed to create monitoring v1 client: %v", err)
 	}
 
 	// If the application was executed with the --project or -p flag, put all the projects directly in the projects channel.
@@ -237,7 +232,7 @@ func Execute() {
 	for i := 0; i < int(threads); i++ {
 		go func() {
 			for policy := range policiesIn {
-				processAlertPolicy(ctx, queryClient, metricClient, httpClient, policy, start, end, policiesOut)
+				processAlertPolicy(ctx, queryClient, metricClient, monitoring_v1Service, policy, start, end, policiesOut)
 			}
 			wg3.Done()
 		}()

go.mod

@@ -7,7 +7,6 @@ require (
 	cloud.google.com/go/monitoring v1.21.0
 	cloud.google.com/go/resourcemanager v1.10.0
 	github.com/spf13/cobra v1.8.1
-	golang.org/x/oauth2 v0.22.0
 	google.golang.org/api v0.194.0
 	google.golang.org/protobuf v1.34.2
 )
@@ -38,6 +37,7 @@ require (
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	golang.org/x/crypto v0.26.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
 	golang.org/x/text v0.17.0 // indirect