Update Prometheus dependencies (#775)

* fix(deps): update module github.com/prometheus/prom2json to v1.3.3 * Update the proto library/tools to migrate away from the deprecated github.com/golang/protobuf version --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
newrelic · May 31, 2023 · 09cf2b9 · 09cf2b9
1 parent 02a0f3d
commit 09cf2b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/google/go-cmp v0.5.9
 	github.com/newrelic/infra-integrations-sdk v3.7.3+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_model v0.3.0
-	github.com/prometheus/prom2json v1.3.2
+	github.com/prometheus/client_model v0.4.0
+	github.com/prometheus/prom2json v1.3.3
 	github.com/segmentio/go-camelcase v0.0.0-20160726192923-7085f1e3c734
 	github.com/sethgrid/pester v1.2.0
 	github.com/sirupsen/logrus v1.9.2
@@ -47,15 +47,15 @@ require (
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/common v0.40.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
 	github.com/spf13/afero v1.9.4 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
 	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/term v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect

diff --git a/go.sum b/go.sum
@@ -211,10 +211,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
+github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
+github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
 github.com/prometheus/common v0.40.0 h1:Afz7EVRqGg2Mqqf4JuF9vdvp1pi220m55Pi9T2JnO4Q=
 github.com/prometheus/common v0.40.0/go.mod h1:L65ZJPSmfn/UBWLQIHV7dBrKFidB/wPlF1y5TlSt9OE=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
 github.com/prometheus/prom2json v1.3.2 h1:heRKAGHWqm8N3IaRDDNBBJNVS6a9mLdsTlFhvOaNGb0=
 github.com/prometheus/prom2json v1.3.2/go.mod h1:TQ9o1OxW0eyhl4BBpVpGGsavyJfTDETna4/d0Kib+V0=
+github.com/prometheus/prom2json v1.3.3 h1:IYfSMiZ7sSOfliBoo89PcufjWO4eAR0gznGcETyaUgo=
+github.com/prometheus/prom2json v1.3.3/go.mod h1:Pv4yIPktEkK7btWsrUTWDDDrnpUrAELaOCj+oFwlgmc=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
@@ -357,6 +363,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
 golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
+golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
+golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

diff --git a/src/prometheus/definition_test.go b/src/prometheus/definition_test.go
@@ -277,20 +277,16 @@ var summaryRawGroups = definition.RawGroups{
 							{
 								Quantile:         float64Ptr(0.5),
 								Value:            float64Ptr(42),
-								XXX_unrecognized: nil,
 							},
 							{
 								Quantile:         float64Ptr(0.9),
 								Value:            float64Ptr(43),
-								XXX_unrecognized: nil,
 							},
 							{
 								Quantile:         float64Ptr(0.99),
 								Value:            float64Ptr(44),
-								XXX_unrecognized: nil,
 							},
 						},
-						XXX_unrecognized: nil,
 					},
 				}, {
 					Labels: Labels{"l2": "v2", "l1": "v1", "handler": "other"},
@@ -301,20 +297,16 @@ var summaryRawGroups = definition.RawGroups{
 							{
 								Quantile:         float64Ptr(0.5),
 								Value:            float64Ptr(42),
-								XXX_unrecognized: nil,
 							},
 							{
 								Quantile:         float64Ptr(0.9),
 								Value:            float64Ptr(43),
-								XXX_unrecognized: nil,
 							},
 							{
 								Quantile:         float64Ptr(0.99),
 								Value:            float64Ptr(44),
-								XXX_unrecognized: nil,
 							},
 						},
-						XXX_unrecognized: nil,
 					},
 				},
 			},
@@ -336,20 +328,16 @@ var summaryMetricFamily = []MetricFamily{
 						{
 							Quantile:         float64Ptr(0.5),
 							Value:            float64Ptr(42),
-							XXX_unrecognized: nil,
 						},
 						{
 							Quantile:         float64Ptr(0.9),
 							Value:            float64Ptr(43),
-							XXX_unrecognized: nil,
 						},
 						{
 							Quantile:         float64Ptr(0.99),
 							Value:            float64Ptr(44),
-							XXX_unrecognized: nil,
 						},
 					},
-					XXX_unrecognized: nil,
 				},
 			},
 			{
@@ -361,20 +349,16 @@ var summaryMetricFamily = []MetricFamily{
 						{
 							Quantile:         float64Ptr(0.5),
 							Value:            float64Ptr(42),
-							XXX_unrecognized: nil,
 						},
 						{
 							Quantile:         float64Ptr(0.9),
 							Value:            float64Ptr(43),
-							XXX_unrecognized: nil,
 						},
 						{
 							Quantile:         float64Ptr(0.99),
 							Value:            float64Ptr(44),
-							XXX_unrecognized: nil,
 						},
 					},
-					XXX_unrecognized: nil,
 				},
 			},
 		},
@@ -975,20 +959,16 @@ func TestFetchFuncs_CorrectValue(t *testing.T) {
 										{
 											Quantile:         float64Ptr(0.5),
 											Value:            float64Ptr(math.NaN()),
-											XXX_unrecognized: nil,
 										},
 										{
 											Quantile:         float64Ptr(0.9),
 											Value:            float64Ptr(math.NaN()),
-											XXX_unrecognized: nil,
 										},
 										{
 											Quantile:         float64Ptr(0.99),
 											Value:            float64Ptr(44),
-											XXX_unrecognized: nil,
 										},
 									},
-									XXX_unrecognized: nil,
 								},
 							},
 						},