From 67ffbb068d7dd6d6e9aec810b77f14951acc6a64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 03:24:16 +0000 Subject: [PATCH 1/2] Bump go.opentelemetry.io/otel from 1.19.0 to 1.20.0 in /src/autoscaler Bumps [go.opentelemetry.io/otel](https://github.com/open-telemetry/opentelemetry-go) from 1.19.0 to 1.20.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.19.0...v1.20.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/autoscaler/go.mod | 12 ++++++------ src/autoscaler/go.sum | 15 ++++++++------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index c50b93a0c9..6f3c5fa724 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -12,8 +12,6 @@ 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.7.0 - 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.1 @@ -36,10 +34,9 @@ require ( github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 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 v1.20.0 go.opentelemetry.io/otel/sdk v1.19.0 - go.opentelemetry.io/otel/trace v1.19.0 + go.opentelemetry.io/otel/trace v1.20.0 golang.org/x/crypto v0.15.0 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/net v0.18.0 @@ -61,8 +58,10 @@ 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.7.0 // 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/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/google/go-cmp v0.6.0 // 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.20.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/mod v0.14.0 // indirect diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 1896e84a47..6cb07cd3c8 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -720,8 +720,9 @@ github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2C github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= @@ -1049,14 +1050,14 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0 h1:CaagQrotQLgtDlHU6u9pE/Mf4mAwiLD8wrReIVt06lY= go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.45.0/go.mod h1:LOjFy00/ZMyMYfKFPta6kZe2cDUc1sNo/qtv1pSORWA= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= +go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs= +go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA= +go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM= go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ= +go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= From e28cc8c8c14ec3a50a0b90f9f3bace0d480d7439 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 03:32:14 +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/eventgenerator/spec | 1 + packages/golangapiserver/spec | 1 + packages/metricsforwarder/spec | 1 + packages/metricsgateway/spec | 1 + packages/metricsserver/spec | 1 + packages/operator/spec | 1 + packages/scalingengine/spec | 1 + src/autoscaler/go.mod | 6 +++--- 8 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/eventgenerator/spec b/packages/eventgenerator/spec index d6aeb433b9..0f5b38c90f 100644 --- a/packages/eventgenerator/spec +++ b/packages/eventgenerator/spec @@ -98,6 +98,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/internal/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/internal/attribute/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/golang.org/x/crypto/bcrypt/* # gosub - autoscaler/vendor/golang.org/x/crypto/blowfish/* # gosub - autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub diff --git a/packages/golangapiserver/spec b/packages/golangapiserver/spec index 4df60ef8db..32a86f4357 100644 --- a/packages/golangapiserver/spec +++ b/packages/golangapiserver/spec @@ -157,6 +157,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.19.0/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/go.uber.org/multierr/* # gosub - autoscaler/vendor/go.uber.org/zap/* # gosub - autoscaler/vendor/go.uber.org/zap/buffer/* # gosub diff --git a/packages/metricsforwarder/spec b/packages/metricsforwarder/spec index 499cf27f98..b5b8d281d9 100644 --- a/packages/metricsforwarder/spec +++ b/packages/metricsforwarder/spec @@ -89,6 +89,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/internal/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/internal/attribute/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/golang.org/x/crypto/bcrypt/* # gosub - autoscaler/vendor/golang.org/x/crypto/blowfish/* # gosub - autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub diff --git a/packages/metricsgateway/spec b/packages/metricsgateway/spec index 722e4590e9..9ef04a82f2 100644 --- a/packages/metricsgateway/spec +++ b/packages/metricsgateway/spec @@ -83,6 +83,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/internal/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/internal/attribute/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/golang.org/x/crypto/bcrypt/* # gosub - autoscaler/vendor/golang.org/x/crypto/blowfish/* # gosub - autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub diff --git a/packages/metricsserver/spec b/packages/metricsserver/spec index c1ca04bda2..8a120f48e6 100644 --- a/packages/metricsserver/spec +++ b/packages/metricsserver/spec @@ -85,6 +85,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/internal/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/internal/attribute/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/golang.org/x/crypto/bcrypt/* # gosub - autoscaler/vendor/golang.org/x/crypto/blowfish/* # gosub - autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub diff --git a/packages/operator/spec b/packages/operator/spec index 319b2c2d2f..ba6d61b087 100644 --- a/packages/operator/spec +++ b/packages/operator/spec @@ -75,6 +75,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/internal/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/internal/attribute/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/golang.org/x/crypto/bcrypt/* # gosub - autoscaler/vendor/golang.org/x/crypto/blowfish/* # gosub - autoscaler/vendor/golang.org/x/crypto/pbkdf2/* # gosub diff --git a/packages/scalingengine/spec b/packages/scalingengine/spec index 5250335a8d..e1b5b066d4 100644 --- a/packages/scalingengine/spec +++ b/packages/scalingengine/spec @@ -135,6 +135,7 @@ files: - autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.19.0/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/semconv/v1.21.0/* # gosub - autoscaler/vendor/go.opentelemetry.io/otel/trace/* # gosub +- autoscaler/vendor/go.opentelemetry.io/otel/trace/embedded/* # gosub - autoscaler/vendor/go.uber.org/multierr/* # gosub - autoscaler/vendor/go.uber.org/zap/* # gosub - autoscaler/vendor/go.uber.org/zap/buffer/* # gosub diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 6f3c5fa724..4b6c3eca3c 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.7.0 + 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.1 @@ -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.20.0 + go.opentelemetry.io/otel/metric v1.20.0 go.opentelemetry.io/otel/sdk v1.19.0 go.opentelemetry.io/otel/trace v1.20.0 golang.org/x/crypto v0.15.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.7.0 // 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.3.0 // 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.20.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/mod v0.14.0 // indirect