merge conflicts

Signed-off-by: Alec Holmes <[email protected]>
envoyproxy · Jun 6, 2023 · 0ab1e02 · 0ab1e02
1 parent 7316a9e
commit 0ab1e02
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 805 deletions.
diff --git a/go.mod b/go.mod
@@ -12,11 +12,8 @@ require (
 	github.com/envoyproxy/go-control-plane/ratelimit v0.0.0-00010101000000-000000000000
 	github.com/golang/protobuf v1.5.3
 	github.com/google/go-cmp v0.5.9
-	github.com/prometheus/client_model v0.4.0
 	github.com/stretchr/testify v1.8.4
-	go.opentelemetry.io/proto/otlp v0.19.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc
 	google.golang.org/grpc v1.55.0
 	google.golang.org/protobuf v1.30.0
 )
@@ -33,7 +30,6 @@ require (
 	golang.org/x/sys v0.8.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect