From 4f8c0f8ec62655adef51a311d8d5f151d49a5566 Mon Sep 17 00:00:00 2001 From: Silvestre Zabala Date: Wed, 3 Jul 2024 16:02:59 +0200 Subject: [PATCH] wip --- src/autoscaler/envelopeprocessor/envelope_processor.go | 2 +- .../envelopeprocessor/envelopeprocessor_test.go | 2 +- .../eventgenerator/aggregator/metric_poller_test.go | 2 +- .../cmd/eventgenerator/eventgenerator_suite_test.go | 2 +- src/autoscaler/eventgenerator/metric/fetcher.go | 2 +- src/autoscaler/eventgenerator/metric/fetcher_test.go | 2 +- src/autoscaler/go.mod | 7 ++++--- src/autoscaler/go.sum | 10 ++++++---- ...ation_logcache_eventgenerator_scalingengine_test.go | 2 +- .../metricsforwarder/forwarder/metric_forwarder.go | 2 +- .../metricsforwarder/forwarder/metron_emitter.go | 2 +- .../metricsforwarder/forwarder/metron_emitter_test.go | 2 +- .../metricsforwarder/forwarder/syslog_emitter.go | 2 +- .../metricsforwarder/forwarder/syslog_emitter_test.go | 2 +- .../metricsforwarder/testhelpers/test_helpers.go | 2 +- src/autoscaler/testhelpers/log_cache_mock.go | 2 +- 16 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/autoscaler/envelopeprocessor/envelope_processor.go b/src/autoscaler/envelopeprocessor/envelope_processor.go index 77dd69df43..e0829bc732 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" "dario.cat/mergo" "golang.org/x/exp/maps" diff --git a/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go b/src/autoscaler/envelopeprocessor/envelopeprocessor_test.go index ebbce1bc6b..978ac2e275 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..8e2b7b6c6e 100644 --- a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go +++ b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go @@ -12,7 +12,7 @@ import ( "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" + "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..af895621fa 100644 --- a/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go +++ b/src/autoscaler/eventgenerator/cmd/eventgenerator/eventgenerator_suite_test.go @@ -3,7 +3,7 @@ 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" + "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 e895299313..2be563c6ab 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher.go +++ b/src/autoscaler/eventgenerator/metric/fetcher.go @@ -12,7 +12,7 @@ import ( "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" + "code.cloudfoundry.org/go-loggregator/v10/rpc/loggregator_v2" "code.cloudfoundry.org/lager/v3" ) diff --git a/src/autoscaler/eventgenerator/metric/fetcher_test.go b/src/autoscaler/eventgenerator/metric/fetcher_test.go index 7a4361f188..1d9c03a30d 100644 --- a/src/autoscaler/eventgenerator/metric/fetcher_test.go +++ b/src/autoscaler/eventgenerator/metric/fetcher_test.go @@ -12,7 +12,7 @@ import ( "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" + "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 3a4eb5f1eb..0c242da148 100644 --- a/src/autoscaler/go.mod +++ b/src/autoscaler/go.mod @@ -6,7 +6,8 @@ require ( code.cloudfoundry.org/cfhttp/v2 v2.1.0 code.cloudfoundry.org/clock v1.1.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-loggregator/v9 v9.2.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-20240627162755-bdf38f4609a1 code.cloudfoundry.org/tlsconfig v0.0.0-20240702174858-4c0df2f29c62 @@ -46,7 +47,7 @@ require ( golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 golang.org/x/net v0.26.0 golang.org/x/time v0.5.0 - google.golang.org/grpc v1.64.0 + google.golang.org/grpc v1.65.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -100,7 +101,7 @@ require ( golang.org/x/text v0.16.0 // indirect golang.org/x/tools v0.22.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // 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 694ad5e9a1..656106e974 100644 --- a/src/autoscaler/go.sum +++ b/src/autoscaler/go.sum @@ -600,6 +600,8 @@ code.cloudfoundry.org/go-diodes v0.0.0-20240604201846-c756bfed2ed3 h1:4WCYwJmqSf 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/v10 v10.0.0 h1:7tSJp4QFh8064jp13zNGoKoIuu8a2GhoGkr53nr9uu0= +code.cloudfoundry.org/go-loggregator/v10 v10.0.0/go.mod h1:gRbT/3OQzBaXtII0vMmCVnF52B0Fvz9XZcCXUrcXpkg= 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-metric-registry v0.0.0-20240604201903-7cef498efb7a h1:XpebbxgIBBy7SrwIGW+gREZuAtnJ9PHWC4Y+k7yje2I= @@ -1672,8 +1674,8 @@ google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d h1:Aqf0fiIdUQEj0Gn9mKFFXoQfTTEaNopWpfVyYADxiSg= google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Od4k8V1LQSizPRUK4OzZ7TBE/20k+jPczUDAEyvn69Y= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/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= @@ -1716,8 +1718,8 @@ google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5v google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/examples v0.0.0-20230512210959-5dcfb37c0b43/go.mod h1:irORyHPQXotoshbRTZVFvPDcfTfFHL23efQeop+H45M= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go b/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go index 73e46d3afc..d9d996581f 100644 --- a/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go +++ b/src/autoscaler/integration/integration_logcache_eventgenerator_scalingengine_test.go @@ -7,7 +7,7 @@ import ( "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" + "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..ba56f1a992 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..1ad772eed4 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..48db661f05 100644 --- a/src/autoscaler/testhelpers/log_cache_mock.go +++ b/src/autoscaler/testhelpers/log_cache_mock.go @@ -11,7 +11,7 @@ import ( "sync" rpc "code.cloudfoundry.org/go-log-cache/v2/rpc/logcache_v1" - "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" "google.golang.org/grpc/credentials"