From f9d5ac03f5c3f1649d124af12c2407b632faee3b Mon Sep 17 00:00:00 2001 From: Yu Long Date: Fri, 1 Nov 2024 15:42:32 -0700 Subject: [PATCH] rebase upstream master --- go.mod | 1 - plugins/parsers/prometheusremotewrite/parser.go | 4 ++-- .../prometheusremotewrite/prometheusremotewrite.go | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d7046681fac6a..26255835fe6f0 100644 --- a/go.mod +++ b/go.mod @@ -91,7 +91,6 @@ require ( github.com/gobwas/glob v0.2.3 github.com/godbus/dbus/v5 v5.1.0 github.com/gofrs/uuid/v5 v5.3.0 - github.com/gofrs/uuid/v5 v5.2.0 github.com/gogo/protobuf v1.3.2 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/golang/geo v0.0.0-20190916061304-5b978397cfec diff --git a/plugins/parsers/prometheusremotewrite/parser.go b/plugins/parsers/prometheusremotewrite/parser.go index 619d07dd54bbc..41bc7cb736978 100644 --- a/plugins/parsers/prometheusremotewrite/parser.go +++ b/plugins/parsers/prometheusremotewrite/parser.go @@ -13,8 +13,8 @@ import ( "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/plugins/parsers" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/gogoproto" // for gogoproto support + "github.com/gogo/protobuf/proto" ) type Parser struct { diff --git a/plugins/serializers/prometheusremotewrite/prometheusremotewrite.go b/plugins/serializers/prometheusremotewrite/prometheusremotewrite.go index 512ea1fc26fcb..58e60bbe6264b 100644 --- a/plugins/serializers/prometheusremotewrite/prometheusremotewrite.go +++ b/plugins/serializers/prometheusremotewrite/prometheusremotewrite.go @@ -16,8 +16,8 @@ import ( "github.com/influxdata/telegraf/plugins/serializers" "github.com/influxdata/telegraf/plugins/serializers/prometheus" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/gogoproto" // for gogoproto support + "github.com/gogo/protobuf/proto" ) type MetricKey uint64