From 128ebfe2acd36fa3067cd09d31f9112b3a8a01aa Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Thu, 21 Dec 2023 15:08:56 +0100 Subject: [PATCH] Update metrics_requester.go --- .../metricbeat/module/gcp/metrics/metrics_requester.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go index 7f59620ca9b7..7cd929d84735 100644 --- a/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go +++ b/x-pack/metricbeat/module/gcp/metrics/metrics_requester.go @@ -11,20 +11,11 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/golang/protobuf/ptypes/duration" - - monitoring "cloud.google.com/go/monitoring/apiv3" - "github.com/golang/protobuf/ptypes/timestamp" - "google.golang.org/api/iterator" - monitoringpb "google.golang.org/genproto/googleapis/monitoring/v3" -======= monitoring "cloud.google.com/go/monitoring/apiv3/v2" "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb" "google.golang.org/api/iterator" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" ->>>>>>> b59a8f4769 (Replace EOL modules: github.com/golang/protobuf by google.golang.org/protobuf (#37212)) "github.com/elastic/beats/v7/libbeat/logp" "github.com/elastic/beats/v7/x-pack/metricbeat/module/gcp"