From 8f5722d9b6a70e98b9349216a91ab6c8651df678 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 03:48:49 +0000 Subject: [PATCH 1/2] Bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 in /src/autoscaler Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.5.0 to 1.5.1. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](https://github.com/gorilla/websocket/compare/v1.5.0...v1.5.1) --- updated-dependencies: - dependency-name: github.com/gorilla/websocket dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/autoscaler/go.mod | 8 ++++---- src/autoscaler/go.sum | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 98d2aa0650..591b2b2efe 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -12,12 +12,10 @@ require ( dario.cat/mergo v1.0.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/go-chi/chi/v5 v5.0.10 - github.com/go-faster/errors v0.6.1 - github.com/go-faster/jx v1.1.0 github.com/go-sql-driver/mysql v1.7.1 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 - github.com/gorilla/websocket v1.5.0 + github.com/gorilla/websocket v1.5.1 github.com/hashicorp/go-retryablehttp v0.7.4 github.com/jackc/pgx/v5 v5.4.3 github.com/jmoiron/sqlx v1.3.5 @@ -37,7 +35,6 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 go.opentelemetry.io/otel v1.19.0 - go.opentelemetry.io/otel/metric v1.19.0 go.opentelemetry.io/otel/sdk v1.19.0 go.opentelemetry.io/otel/trace v1.19.0 golang.org/x/crypto v0.14.0 @@ -61,6 +58,8 @@ require ( github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-faster/errors v0.6.1 // indirect + github.com/go-faster/jx v1.1.0 // indirect github.com/go-faster/yaml v0.4.6 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -88,6 +87,7 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/mod v0.13.0 // indirect diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 2d6356660d..c6a9f9f488 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -840,8 +840,8 @@ github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+ github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= +github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= From 070fe1264567db57d73cd88021e931eb943f6665 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 03:55:21 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=96=F0=9F=A6=BE=F0=9F=9B=A0?= =?UTF-8?q?=EF=B8=8F=20go=20mod=20tidy=20&=20make=20package-specs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/metricsgateway/spec | 2 ++ packages/metricsserver/spec | 2 ++ src/autoscaler/go.mod | 6 +++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/metricsgateway/spec b/packages/metricsgateway/spec index a7831ac6de..722e4590e9 100644 --- a/packages/metricsgateway/spec +++ b/packages/metricsgateway/spec @@ -92,7 +92,9 @@ files: - autoscaler/vendor/golang.org/x/net/http2/* # gosub - autoscaler/vendor/golang.org/x/net/http2/hpack/* # gosub - autoscaler/vendor/golang.org/x/net/idna/* # gosub +- autoscaler/vendor/golang.org/x/net/internal/socks/* # gosub - autoscaler/vendor/golang.org/x/net/internal/timeseries/* # gosub +- autoscaler/vendor/golang.org/x/net/proxy/* # gosub - autoscaler/vendor/golang.org/x/net/trace/* # gosub - autoscaler/vendor/golang.org/x/sync/semaphore/* # gosub - autoscaler/vendor/golang.org/x/sys/unix/* # gosub diff --git a/packages/metricsserver/spec b/packages/metricsserver/spec index 492441044a..c1ca04bda2 100644 --- a/packages/metricsserver/spec +++ b/packages/metricsserver/spec @@ -93,7 +93,9 @@ files: - autoscaler/vendor/golang.org/x/net/http2/* # gosub - autoscaler/vendor/golang.org/x/net/http2/hpack/* # gosub - autoscaler/vendor/golang.org/x/net/idna/* # gosub +- autoscaler/vendor/golang.org/x/net/internal/socks/* # gosub - autoscaler/vendor/golang.org/x/net/internal/timeseries/* # gosub +- autoscaler/vendor/golang.org/x/net/proxy/* # gosub - autoscaler/vendor/golang.org/x/net/trace/* # gosub - autoscaler/vendor/golang.org/x/sync/semaphore/* # gosub - autoscaler/vendor/golang.org/x/sys/unix/* # gosub diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 591b2b2efe..a309caa4c2 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -12,6 +12,8 @@ require ( dario.cat/mergo v1.0.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/go-chi/chi/v5 v5.0.10 + github.com/go-faster/errors v0.6.1 + github.com/go-faster/jx v1.1.0 github.com/go-sql-driver/mysql v1.7.1 github.com/golang/protobuf v1.5.3 github.com/gorilla/mux v1.8.0 @@ -35,6 +37,7 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 go.opentelemetry.io/otel v1.19.0 + go.opentelemetry.io/otel/metric v1.19.0 go.opentelemetry.io/otel/sdk v1.19.0 go.opentelemetry.io/otel/trace v1.19.0 golang.org/x/crypto v0.14.0 @@ -58,8 +61,6 @@ require ( github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-faster/errors v0.6.1 // indirect - github.com/go-faster/jx v1.1.0 // indirect github.com/go-faster/yaml v0.4.6 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -87,7 +88,6 @@ require ( github.com/segmentio/asm v1.2.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/mod v0.13.0 // indirect