diff --git a/devbox.json b/devbox.json index 2f3a8b1e95..7df244e614 100644 --- a/devbox.json +++ b/devbox.json @@ -30,7 +30,6 @@ "oha": "latest", "gum": "0.13.0", "actionlint": "1.7.1", - "uutils-coreutils-noprefix": "latest", "gnutar": "latest", "golangci-lint": "1.59.1", "yq-go": "4.44.2", @@ -39,7 +38,8 @@ "cloudfoundry-cli": "8.7.11", "google-cloud-sdk": "latest", "temurin-bin-17": "latest", - "ruby": "latest" + "ruby": "latest", + "coreutils": "latest" }, "shell": { "init_hook": [ diff --git a/devbox.lock b/devbox.lock index 8fae090a10..b2effd7a48 100644 --- a/devbox.lock +++ b/devbox.lock @@ -241,6 +241,78 @@ } } }, + "coreutils@latest": { + "last_modified": "2024-07-26T16:03:07Z", + "resolved": "github:NixOS/nixpkgs/9014875e6f995a84dd72072e5ef73313e5665faa#coreutils", + "source": "devbox-search", + "version": "9.5", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/pldbvp0p2z2pa76h17g797vvk201155r-coreutils-9.5", + "default": true + }, + { + "name": "info", + "path": "/nix/store/f5qq43zkbwkzf20cyfhbbrjz97pkqc18-coreutils-9.5-info" + } + ], + "store_path": "/nix/store/pldbvp0p2z2pa76h17g797vvk201155r-coreutils-9.5" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/4qd2gbwmm162arayhg2fzgwy6p1nm73i-coreutils-9.5", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/m619k23brc2h4yfqi4kwm2cyf5vjqf6m-coreutils-9.5-debug" + }, + { + "name": "info", + "path": "/nix/store/x8vd2mh8bpcl765zl5irjxglanfmp45s-coreutils-9.5-info" + } + ], + "store_path": "/nix/store/4qd2gbwmm162arayhg2fzgwy6p1nm73i-coreutils-9.5" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/xpz7lrgqgskcxa57pbhakd5iikkw93ag-coreutils-9.5", + "default": true + }, + { + "name": "info", + "path": "/nix/store/lgwj37r7kphv8r1f7cx1ggrk5cqyx9xp-coreutils-9.5-info" + } + ], + "store_path": "/nix/store/xpz7lrgqgskcxa57pbhakd5iikkw93ag-coreutils-9.5" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/dhv5gh89him9a7ddr56cqg87zfkmjihp-coreutils-9.5", + "default": true + }, + { + "name": "debug", + "path": "/nix/store/006bkgp0fb2235g2rwsy1dcwmlwjh9h1-coreutils-9.5-debug" + }, + { + "name": "info", + "path": "/nix/store/iq4vfqbq77x6w0i0f1s1d68rrrkfwlgy-coreutils-9.5-info" + } + ], + "store_path": "/nix/store/dhv5gh89him9a7ddr56cqg87zfkmjihp-coreutils-9.5" + } + } + }, "credhub-cli@2.9.29": { "last_modified": "2024-05-12T16:19:40Z", "resolved": "github:NixOS/nixpkgs/3281bec7174f679eabf584591e75979a258d8c40#credhub-cli", @@ -1101,6 +1173,7 @@ }, "ruby@latest": { "last_modified": "2024-07-07T07:43:47Z", + "plugin_version": "0.0.2", "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#ruby_3_3", "source": "devbox-search", "version": "3.3.2", @@ -1355,54 +1428,6 @@ } } }, - "uutils-coreutils-noprefix@latest": { - "last_modified": "2024-06-12T20:55:33Z", - "resolved": "github:NixOS/nixpkgs/a9858885e197f984d92d7fe64e9fff6b2e488d40#uutils-coreutils-noprefix", - "source": "devbox-search", - "version": "0.0.25", - "systems": { - "aarch64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/m8hrxq8hwp1zxzj1yrswspfrn0q4f38h-uutils-coreutils-0.0.25", - "default": true - } - ], - "store_path": "/nix/store/m8hrxq8hwp1zxzj1yrswspfrn0q4f38h-uutils-coreutils-0.0.25" - }, - "aarch64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/a2bpaq86l697zfll4sv486pvcfbdw5mp-uutils-coreutils-0.0.25", - "default": true - } - ], - "store_path": "/nix/store/a2bpaq86l697zfll4sv486pvcfbdw5mp-uutils-coreutils-0.0.25" - }, - "x86_64-darwin": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/k8v2k0dhfcc3ixs57xv72xwjbbywm6mk-uutils-coreutils-0.0.25", - "default": true - } - ], - "store_path": "/nix/store/k8v2k0dhfcc3ixs57xv72xwjbbywm6mk-uutils-coreutils-0.0.25" - }, - "x86_64-linux": { - "outputs": [ - { - "name": "out", - "path": "/nix/store/7r12wwxmxz9d77k1g7flmpm36wfkg5rc-uutils-coreutils-0.0.25", - "default": true - } - ], - "store_path": "/nix/store/7r12wwxmxz9d77k1g7flmpm36wfkg5rc-uutils-coreutils-0.0.25" - } - } - }, "which@latest": { "last_modified": "2024-04-19T17:36:04-04:00", "resolved": "github:NixOS/nixpkgs/92d295f588631b0db2da509f381b4fb1e74173c5#which", diff --git a/packages/eventgenerator/spec b/packages/eventgenerator/spec index a384b41306..9fb666c4f6 100644 --- a/packages/eventgenerator/spec +++ b/packages/eventgenerator/spec @@ -27,10 +27,10 @@ files: - autoscaler/routes/* # gosub - autoscaler/vendor/code.cloudfoundry.org/cfhttp/v2/* # gosub - autoscaler/vendor/code.cloudfoundry.org/clock/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v2/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v2/internal/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v3/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v3/internal/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/* # gosub - autoscaler/vendor/code.cloudfoundry.org/tlsconfig/* # gosub @@ -145,7 +145,6 @@ files: - autoscaler/vendor/golang.org/x/text/unicode/bidi/* # gosub - autoscaler/vendor/golang.org/x/text/unicode/norm/* # gosub - autoscaler/vendor/golang.org/x/text/width/* # gosub -- autoscaler/vendor/google.golang.org/genproto/googleapis/api/* # gosub - autoscaler/vendor/google.golang.org/genproto/googleapis/api/annotations/* # gosub - autoscaler/vendor/google.golang.org/genproto/googleapis/api/httpbody/* # gosub - autoscaler/vendor/google.golang.org/genproto/googleapis/rpc/status/* # gosub @@ -231,7 +230,6 @@ files: - autoscaler/vendor/google.golang.org/protobuf/reflect/protoregistry/* # gosub - autoscaler/vendor/google.golang.org/protobuf/runtime/protoiface/* # gosub - autoscaler/vendor/google.golang.org/protobuf/runtime/protoimpl/* # gosub -- autoscaler/vendor/google.golang.org/protobuf/types/descriptorpb/* # gosub - autoscaler/vendor/google.golang.org/protobuf/types/known/anypb/* # gosub - autoscaler/vendor/google.golang.org/protobuf/types/known/durationpb/* # gosub - autoscaler/vendor/google.golang.org/protobuf/types/known/fieldmaskpb/* # gosub diff --git a/packages/metricsforwarder/spec b/packages/metricsforwarder/spec index ffacba9478..4bb519bf6e 100644 --- a/packages/metricsforwarder/spec +++ b/packages/metricsforwarder/spec @@ -28,9 +28,9 @@ files: - autoscaler/vendor/code.cloudfoundry.org/cfhttp/v2/* # gosub - autoscaler/vendor/code.cloudfoundry.org/clock/* # gosub - autoscaler/vendor/code.cloudfoundry.org/go-diodes/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v9/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v9/rfc5424/* # gosub -- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v10/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v10/rfc5424/* # gosub +- autoscaler/vendor/code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2/* # gosub - autoscaler/vendor/code.cloudfoundry.org/go-metric-registry/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/* # gosub - autoscaler/vendor/code.cloudfoundry.org/lager/v3/internal/truncate/* # gosub diff --git a/src/autoscaler/envelopeprocessor/envelope_processor.go b/src/autoscaler/envelopeprocessor/envelope_processor.go index f24a064b76..a29f6865dd 100644 --- a/src/autoscaler/envelopeprocessor/envelope_processor.go +++ b/src/autoscaler/envelopeprocessor/envelope_processor.go @@ -8,7 +8,7 @@ import ( "time" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3" "golang.org/x/exp/maps" ) diff --git a/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go b/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go index 274712847d..4f46547cb4 100644 --- a/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go +++ b/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/envelopeprocessor" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3/lagertest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go index 396b9f46eb..0becab0103 100644 --- a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go +++ b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go @@ -11,8 +11,8 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/metric" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers" - rpc "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + rpc "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3/lagertest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go b/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go index c53cd7057a..ef46f3ae63 100644 --- a/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go +++ b/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go @@ -2,8 +2,8 @@ package main_test import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers" - rpc "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + rpc "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/eventgenerator/metric/fetcher.go b/src/autoscaler/eventgenerator/metric/fetcher.go index 7886d96d41..1ab423957f 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher.go +++ b/src/autoscaler/eventgenerator/metric/fetcher.go @@ -10,9 +10,9 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/envelopeprocessor" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - logcache "code.cloudfoundry.org/go-log-cache/v2" - "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + logcache "code.cloudfoundry.org/go-log-cache/v3" + "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3" ) diff --git a/src/autoscaler/eventgenerator/metric/fetcher_factory.go b/src/autoscaler/eventgenerator/metric/fetcher_factory.go index cec264b62e..372117d814 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher_factory.go +++ b/src/autoscaler/eventgenerator/metric/fetcher_factory.go @@ -7,7 +7,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/envelopeprocessor" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/config" - logcache "code.cloudfoundry.org/go-log-cache/v2" + logcache "code.cloudfoundry.org/go-log-cache/v3" "code.cloudfoundry.org/lager/v3" gogrpc "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/src/autoscaler/eventgenerator/metric/fetcher_factory_test.go b/src/autoscaler/eventgenerator/metric/fetcher_factory_test.go index 49c0a09975..a830db8118 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher_factory_test.go +++ b/src/autoscaler/eventgenerator/metric/fetcher_factory_test.go @@ -13,7 +13,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/fakes" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/testhelpers" - logcache "code.cloudfoundry.org/go-log-cache/v2" + logcache "code.cloudfoundry.org/go-log-cache/v3" "code.cloudfoundry.org/lager/v3/lagertest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/eventgenerator/metric/fetcher_test.go b/src/autoscaler/eventgenerator/metric/fetcher_test.go index 96c0a8d4c3..cccf3bd8fe 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher_test.go +++ b/src/autoscaler/eventgenerator/metric/fetcher_test.go @@ -10,9 +10,9 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/metric" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/fakes" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - logcache "code.cloudfoundry.org/go-log-cache/v2" - "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + logcache "code.cloudfoundry.org/go-log-cache/v3" + "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3/lagertest" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/go.mod b/src/autoscaler/go.mod index 8e6a3c31f4..38fbbde64f 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -5,10 +5,10 @@ go 1.22.1 require ( code.cloudfoundry.org/cfhttp/v2 v2.1.0 code.cloudfoundry.org/clock v1.2.0 - code.cloudfoundry.org/go-log-cache/v2 v2.0.7 - code.cloudfoundry.org/go-loggregator/v9/v10 v10.0.0 + code.cloudfoundry.org/go-log-cache/v3 v3.0.1 + code.cloudfoundry.org/go-loggregator/v10 v10.0.0 code.cloudfoundry.org/lager/v3 v3.0.3 - code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240723222507-f3307e073100 + code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240730181045-a0abd75d08df code.cloudfoundry.org/tlsconfig v0.0.0-20240712175922-ffce9516cec8 github.com/cenkalti/backoff/v4 v4.3.0 github.com/go-chi/chi/v5 v5.1.0 @@ -23,8 +23,8 @@ require ( github.com/jmoiron/sqlx v1.4.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.8.1 github.com/ogen-go/ogen v1.2.2 - github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 + github.com/onsi/ginkgo/v2 v2.19.1 + github.com/onsi/gomega v1.34.1 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pivotal-cf/brokerapi/v11 v11.0.4 github.com/prometheus/client_golang v1.19.1 @@ -49,7 +49,7 @@ require ( ) require ( - code.cloudfoundry.org/go-diodes v0.0.0-20240604201846-c756bfed2ed3 // indirect + code.cloudfoundry.org/go-diodes v0.0.0-20240723012033-bf559dd3d0b1 // indirect code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/andybalholm/brotli v1.1.0 // indirect @@ -68,8 +68,8 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/google/pprof v0.0.0-20240721033354-7089f98c1d14 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect @@ -96,8 +96,8 @@ require ( golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/tools v0.23.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) diff --git a/src/autoscaler/go.sum b/src/autoscaler/go.sum index 4dd4f2626c..45fc2b6072 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -596,18 +596,18 @@ code.cloudfoundry.org/cfhttp/v2 v2.1.0 h1:HbQ5H2R+HEKG/rcB6Gk3okeC3h2fAC4PPnLQoM code.cloudfoundry.org/cfhttp/v2 v2.1.0/go.mod h1:k9R36Y/9dUc9OsX4dfDuEjHZ7Q00ttklKQj6HD6h6+U= code.cloudfoundry.org/clock v1.2.0 h1:1swXS7yPmQmhAdkTb1nJ2c0geOdf4LvibUleNCo2HjA= code.cloudfoundry.org/clock v1.2.0/go.mod h1:foDbmVp5RIuIGlota90ot4FkJtx5m4+oKoWiVuu2FDg= -code.cloudfoundry.org/go-diodes v0.0.0-20240604201846-c756bfed2ed3 h1:4WCYwJmqSfV7ChDohsJB8Z0aDVklIE+n8OTBJxpif0c= -code.cloudfoundry.org/go-diodes v0.0.0-20240604201846-c756bfed2ed3/go.mod h1:8O5g1DEzJU9ktEmykKPhY4mZOM/dBENWVHKVInuuch8= -code.cloudfoundry.org/go-log-cache/v2 v2.0.7 h1:yR/JjQ/RscO1n4xVAT9HDYcpx5ET/3Cq2/RhpJml6ZU= -code.cloudfoundry.org/go-log-cache/v2 v2.0.7/go.mod h1:6KQe2FeeaqRheD5vCvpyTa80YoJojB/r21E54mT97Mc= -code.cloudfoundry.org/go-loggregator/v9 v9.2.1 h1:S6Lgg5UJbhh2bt2TGQxs6R00CF8PrUA3GFPYDxy56Fk= -code.cloudfoundry.org/go-loggregator/v9 v9.2.1/go.mod h1:FTFFruqGeOhVCDFvyLgl8EV8YW63NNwRzLhxJcporu8= +code.cloudfoundry.org/go-diodes v0.0.0-20240723012033-bf559dd3d0b1 h1:gkVwNAzYAZVEzaFKkiwGGP9+gETtFocX+lP6nm1fqPk= +code.cloudfoundry.org/go-diodes v0.0.0-20240723012033-bf559dd3d0b1/go.mod h1:KZrwsjqkXOSxz4iNcMasnXU77a7nFWFYKvScRZqxR+8= +code.cloudfoundry.org/go-log-cache/v3 v3.0.1 h1:+6Lg5IQMCzqZw4aMF2hwjRar7z1SfSUop08+n21g8Xk= +code.cloudfoundry.org/go-log-cache/v3 v3.0.1/go.mod h1:NkNQXq92zrE64fFTqsLjO4qn5gs3ijiznUzbte8FDl4= +code.cloudfoundry.org/go-loggregator/v10 v10.0.0 h1:7tSJp4QFh8064jp13zNGoKoIuu8a2GhoGkr53nr9uu0= +code.cloudfoundry.org/go-loggregator/v10 v10.0.0/go.mod h1:gRbT/3OQzBaXtII0vMmCVnF52B0Fvz9XZcCXUrcXpkg= code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a h1:XpebbxgIBBy7SrwIGW+gREZuAtnJ9PHWC4Y+k7yje2I= code.cloudfoundry.org/go-metric-registry v0.0.0-20240604201903-7cef498efb7a/go.mod h1:/Be8VtLiCeMUoYdUzFtmW8GGkk89HAy3zD79KUXzbhs= code.cloudfoundry.org/lager/v3 v3.0.3 h1:/UTmadZfIaKuT/whEinSxK1mzRfNu1uPfvjFfGqiwzM= code.cloudfoundry.org/lager/v3 v3.0.3/go.mod h1:Zn5q1SrIuuHjEUE7xerMKt3ztunrJQCZETAo7rV0CH8= -code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240723222507-f3307e073100 h1:ZTOC6LL7s7cRzwwTlPaYRDq6kX+wqerKERGMVk3OI4w= -code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240723222507-f3307e073100/go.mod h1:LlTzJMtG7oiiRdtyHjNzH7ylMyGqJK3AFumu4BAE8Sg= +code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240730181045-a0abd75d08df h1:wuqwqKVwOdKvbh5US8SdFVMqVptUFE/7aJe7PGyyiMs= +code.cloudfoundry.org/loggregator-agent-release/src v0.0.0-20240730181045-a0abd75d08df/go.mod h1:7BUPca/5NvVDYoZVtbB5Gy3EuydX4fuZL8PG/z3mJqY= code.cloudfoundry.org/tlsconfig v0.0.0-20240712175922-ffce9516cec8 h1:YWUbqlyYX4nf+mfbacMAgYxM/C9jWcFCurWssGmJJXI= code.cloudfoundry.org/tlsconfig v0.0.0-20240712175922-ffce9516cec8/go.mod h1:NBHWa9Nc4D4F67/xur/iZrELZ36+1l7JYzNht0g6naI= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -815,8 +815,8 @@ github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20240721033354-7089f98c1d14 h1:m2fdPWWX/0mdyA1X3XbVTag5NEwmWv0mieoVuRq14A4= -github.com/google/pprof v0.0.0-20240721033354-7089f98c1d14/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -845,8 +845,8 @@ github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWS 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= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0 h1:CWyXh/jylQWp2dtiV33mY4iSSp6yf4lmn+c7/tN+ObI= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.21.0/go.mod h1:nCLIt0w3Ept2NwF8ThLmrppXsfT07oC8k0XNDxd8sVU= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= @@ -933,8 +933,8 @@ github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxm github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= github.com/onsi/ginkgo/v2 v2.9.2/go.mod h1:WHcJJG2dIlcCqVfBAwUCrJxSPFb6v4azBwgxeMeDuts= github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.19.1 h1:QXgq3Z8Crl5EL1WBAC98A5sEBHARrAJNzAmMxzLcRF0= +github.com/onsi/ginkgo/v2 v2.19.1/go.mod h1:O3DtEWQkPa/F7fBMgmZQKKsluAy8pd3rEQdrjkPb9zA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= @@ -949,8 +949,8 @@ github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfad github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw= github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/openzipkin/zipkin-go v0.4.2 h1:zjqfqHjUpPmB3c1GlCvvgsM1G4LkvqQbBDueDOCg/jA= github.com/openzipkin/zipkin-go v0.4.2/go.mod h1:ZeVkFjuuBiSy13y8vpSDCjMi9GoI3hPpCJSBx/EYFhY= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= @@ -1067,8 +1067,8 @@ go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39S 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= -go.step.sm/crypto v0.50.0 h1:BqI9sEgocoHDLLHiZnFqdqXl5FjdMvOWKMm/fKL/lrw= -go.step.sm/crypto v0.50.0/go.mod h1:NCFMhLS6FJXQ9sD9PP282oHtsBWLrI6wXZY0eOkq7t8= +go.step.sm/crypto v0.51.1 h1:ktUg/2hetEMiBAqgz502ktZDGoDoGrcHFg3XpkmkvvA= +go.step.sm/crypto v0.51.1/go.mod h1:PdrhttNU/tG9/YsVd4fdlysBN+UV503p0o2irFZQlAw= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -1667,10 +1667,10 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= -google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f h1:b1Ln/PG8orm0SsBbHZWke8dDp2lrCD4jSmfglFpTZbk= +google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f h1:RARaIm8pxYuxyNPbBQf5igT7XdOyCNtat1qAT2ZxjU4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go b/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go index 73e46d3afc..19dd87cbdc 100644 --- a/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go +++ b/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go @@ -6,8 +6,8 @@ import ( "time" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - rpc "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + rpc "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/src/autoscaler/metricsforwarder/forwarder/metric_forwarder.go b/src/autoscaler/metricsforwarder/forwarder/metric_forwarder.go index fef18907e5..edd3569a35 100644 --- a/src/autoscaler/metricsforwarder/forwarder/metric_forwarder.go +++ b/src/autoscaler/metricsforwarder/forwarder/metric_forwarder.go @@ -3,7 +3,7 @@ package forwarder import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/config" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9" + "code.cloudfoundry.org/go-loggregator/v10" "code.cloudfoundry.org/lager/v3" ) diff --git a/src/autoscaler/metricsforwarder/forwarder/metron_emitter.go b/src/autoscaler/metricsforwarder/forwarder/metron_emitter.go index dc37d0fb5d..9019ece0ef 100644 --- a/src/autoscaler/metricsforwarder/forwarder/metron_emitter.go +++ b/src/autoscaler/metricsforwarder/forwarder/metron_emitter.go @@ -4,7 +4,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/helpers" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/config" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9" + "code.cloudfoundry.org/go-loggregator/v10" "code.cloudfoundry.org/lager/v3" ) diff --git a/src/autoscaler/metricsforwarder/forwarder/metron_emitter_test.go b/src/autoscaler/metricsforwarder/forwarder/metron_emitter_test.go index c35b0d5a78..be74511c48 100644 --- a/src/autoscaler/metricsforwarder/forwarder/metron_emitter_test.go +++ b/src/autoscaler/metricsforwarder/forwarder/metron_emitter_test.go @@ -10,7 +10,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/forwarder" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/testhelpers" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/src/autoscaler/metricsforwarder/forwarder/syslog_emitter.go b/src/autoscaler/metricsforwarder/forwarder/syslog_emitter.go index c3e80905b7..5f73cdf002 100644 --- a/src/autoscaler/metricsforwarder/forwarder/syslog_emitter.go +++ b/src/autoscaler/metricsforwarder/forwarder/syslog_emitter.go @@ -8,7 +8,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/config" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3" "code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress" "code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/syslog" diff --git a/src/autoscaler/metricsforwarder/forwarder/syslog_emitter_test.go b/src/autoscaler/metricsforwarder/forwarder/syslog_emitter_test.go index 5270ef575e..d963b917b9 100644 --- a/src/autoscaler/metricsforwarder/forwarder/syslog_emitter_test.go +++ b/src/autoscaler/metricsforwarder/forwarder/syslog_emitter_test.go @@ -9,7 +9,7 @@ import ( "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/config" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/metricsforwarder/forwarder" "code.cloudfoundry.org/app-autoscaler/src/autoscaler/models" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3/lagertest" "code.cloudfoundry.org/loggregator-agent-release/src/pkg/egress/syslog" . "github.com/onsi/ginkgo/v2" diff --git a/src/autoscaler/metricsforwarder/testhelpers/test_helpers.go b/src/autoscaler/metricsforwarder/testhelpers/test_helpers.go index 702be23e44..b8c64e7f8a 100644 --- a/src/autoscaler/metricsforwarder/testhelpers/test_helpers.go +++ b/src/autoscaler/metricsforwarder/testhelpers/test_helpers.go @@ -6,7 +6,7 @@ import ( "net" "os" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "golang.org/x/net/context" "google.golang.org/grpc" diff --git a/src/autoscaler/testhelpers/log_cache_mock.go b/src/autoscaler/testhelpers/log_cache_mock.go index 4c4ccf18de..6c67afdf5c 100644 --- a/src/autoscaler/testhelpers/log_cache_mock.go +++ b/src/autoscaler/testhelpers/log_cache_mock.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - rpc "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "code.cloudfoundry.org/go-loggregator/v9/rpc/loggregator_v2" + rpc "code.cloudfoundry.org/go-log-cache/v3/rpc/logcache_v1" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials"