replace custom LogCacheClient with a simple LogCacheFetcher that no l…

…onger takes care of also building the actual logcache.Client
cloudfoundry · Jun 14, 2024 · 3331a67 · 3331a67
1 parent 16f04ba
commit 3331a67
Show file tree

Hide file tree

Showing 16 changed files with 745 additions and 1,062 deletions.
diff --git a/packages/eventgenerator/spec b/packages/eventgenerator/spec
@@ -14,10 +14,10 @@ files:
 - autoscaler/db/sqldb/* # gosub
 - autoscaler/envelopeprocessor/* # gosub
 - autoscaler/eventgenerator/aggregator/* # gosub
-- autoscaler/eventgenerator/client/* # gosub
 - autoscaler/eventgenerator/cmd/eventgenerator/* # gosub
 - autoscaler/eventgenerator/config/* # gosub
 - autoscaler/eventgenerator/generator/* # gosub
+- autoscaler/eventgenerator/metric/* # gosub
 - autoscaler/eventgenerator/server/* # gosub
 - autoscaler/healthendpoint/* # gosub
 - autoscaler/helpers/* # gosub

diff --git a/src/autoscaler/eventgenerator/aggregator/metric_poller.go b/src/autoscaler/eventgenerator/aggregator/metric_poller.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"time"
 
-	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/client"
+	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/metric"
 
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/models"
 	"code.cloudfoundry.org/lager/v3"
@@ -15,16 +15,16 @@ import (
 type MetricPoller struct {
 	logger          lager.Logger
 	doneChan        chan bool
-	metricClient    client.MetricClient
+	metricClient    metric.Fetcher
 	appMonitorsChan chan *models.AppMonitor
 	appMetricChan   chan *models.AppMetric
 }
 
-func NewMetricPoller(logger lager.Logger, metricClient client.MetricClient, appMonitorsChan chan *models.AppMonitor, appMetricChan chan *models.AppMetric) *MetricPoller {
+func NewMetricPoller(logger lager.Logger, metricFetcher metric.Fetcher, appMonitorsChan chan *models.AppMonitor, appMetricChan chan *models.AppMetric) *MetricPoller {
 	return &MetricPoller{
 		logger:          logger.Session("MetricPoller"),
 		appMonitorsChan: appMonitorsChan,
-		metricClient:    metricClient,
+		metricClient:    metricFetcher,
 		doneChan:        make(chan bool),
 		appMetricChan:   appMetricChan,
 	}
@@ -62,7 +62,7 @@ func (m *MetricPoller) retrieveMetric(appMonitor *models.AppMonitor) error {
 	endTime := time.Now()
 	startTime := endTime.Add(0 - statWindow)
 
-	metrics, err := m.metricClient.GetMetrics(appId, metricType, startTime, endTime)
+	metrics, err := m.metricClient.FetchMetrics(appId, metricType, startTime, endTime)
 	if err != nil {
 		return fmt.Errorf("retrieveMetric Failed: %w", err)
 	}

diff --git a/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go b/src/autoscaler/eventgenerator/aggregator/metric_poller_test.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/aggregator"
-	. "code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/client"
 	"code.cloudfoundry.org/app-autoscaler/src/autoscaler/eventgenerator/config"
+	"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"
@@ -29,7 +29,7 @@ var _ = Describe("MetricPoller", func() {
 		appMonitorsChan chan *models.AppMonitor
 		appMetricChan   chan *models.AppMetric
 		metricPoller    *MetricPoller
-		metricClient    MetricClient
+		metricFetcher   metric.Fetcher
 		mockLogCache    *testhelpers.MockLogCache
 		appMonitor      *models.AppMonitor
 	)
@@ -51,13 +51,14 @@ var _ = Describe("MetricPoller", func() {
 	Context("When metric-collector is not running", func() {
 
 		BeforeEach(func() {
-			metricClient = NewMetricClientFactory().GetMetricClient(logger, &config.Config{
+			metricFetcher, err := metric.NewLogCacheFetcherFactory(metric.StandardLogCacheFetcherCreator).CreateFetcher(logger, config.Config{
 				MetricCollector: config.MetricCollectorConfig{
 					MetricCollectorURL: "this.endpoint.does.not.exist:1234",
 				},
 			})
+			Expect(err).ToNot(HaveOccurred())
 
-			metricPoller = NewMetricPoller(logger, metricClient, appMonitorsChan, appMetricChan)
+			metricPoller = NewMetricPoller(logger, metricFetcher, appMonitorsChan, appMetricChan)
 			metricPoller.Start()
 
 			Expect(appMonitorsChan).Should(BeSent(appMonitor))
@@ -188,7 +189,7 @@ var _ = Describe("MetricPoller", func() {
 			err = mockLogCache.Start(3000 + GinkgoParallelProcess())
 			Expect(err).ToNot(HaveOccurred())
 
-			metricClient = NewMetricClientFactory().GetMetricClient(logger, &config.Config{
+			metricFetcher, err = metric.NewLogCacheFetcherFactory(metric.StandardLogCacheFetcherCreator).CreateFetcher(logger, config.Config{
 				MetricCollector: config.MetricCollectorConfig{
 					MetricCollectorURL: mockLogCache.URL(),
 					TLSClientCerts: models.TLSCerts{
@@ -198,10 +199,11 @@ var _ = Describe("MetricPoller", func() {
 					},
 				},
 			})
+			Expect(err).ToNot(HaveOccurred())
 		})
 
 		JustBeforeEach(func() {
-			metricPoller = NewMetricPoller(logger, metricClient, appMonitorsChan, appMetricChan)
+			metricPoller = NewMetricPoller(logger, metricFetcher, appMonitorsChan, appMetricChan)
 			metricPoller.Start()
 
 			Expect(appMonitorsChan).Should(BeSent(appMonitor))
@@ -265,7 +267,7 @@ var _ = Describe("MetricPoller", func() {
 
 	Context("Stop", func() {
 		BeforeEach(func() {
-			metricPoller = NewMetricPoller(logger, metricClient, appMonitorsChan, appMetricChan)
+			metricPoller = NewMetricPoller(logger, metricFetcher, appMonitorsChan, appMetricChan)
 			metricPoller.Start()
 			metricPoller.Stop()
 			Eventually(logger.Buffer).Should(Say("stopped"))