set up loggregator metric config for bbs

Author: kart2bc

cmd/bbs/actual_lrp_test.go

@@ -682,6 +682,10 @@ var _ = Describe("ActualLRP API", func() {
 					cfg.DatabaseConnectionString = sqlRunner.ConnectionString()
 					cfg.DatabaseDriver = sqlRunner.DriverName()
 					cfg.ListenAddress = locketAddress
+					cfg.LoggregatorConfig.APIPort = metricsPort
+					cfg.LoggregatorConfig.CACertPath = metronCAFile
+					cfg.LoggregatorConfig.CertPath = metronServerCertFile
+					cfg.LoggregatorConfig.KeyPath = metronServerKeyFile
 				})
 
 				locketProcess = ginkgomon.Invoke(locketRunner)

cmd/bbs/main_suite_test.go

@@ -64,6 +64,9 @@ var (
 	signalMetricsChan chan struct{}
 	sqlProcess        ifrit.Process
 	sqlRunner         sqlrunner.SQLRunner
+
+	metronCAFile, metronServerCertFile, metronServerKeyFile string
+	metricsPort                                             int
 )
 
 func TestBBS(t *testing.T) {
@@ -113,6 +116,24 @@ var _ = BeforeEach(func() {
 	ctx = context.Background()
 	fixturesPath := "fixtures"
 
+	metronCAFile = path.Join(fixturesPath, "metron", "CA.crt")
+	metronClientCertFile := path.Join(fixturesPath, "metron", "client.crt")
+	metronClientKeyFile := path.Join(fixturesPath, "metron", "client.key")
+	metronServerCertFile = path.Join(fixturesPath, "metron", "metron.crt")
+	metronServerKeyFile = path.Join(fixturesPath, "metron", "metron.key")
+
+	testIngressServer, err = testhelpers.NewTestIngressServer(metronServerCertFile, metronServerKeyFile, metronCAFile)
+	Expect(err).NotTo(HaveOccurred())
+
+	testIngressServer.Start()
+
+	metricsPort, err = strconv.Atoi(strings.TrimPrefix(testIngressServer.Addr(), "127.0.0.1:"))
+	Expect(err).NotTo(HaveOccurred())
+
+	receiversChan := testIngressServer.Receivers()
+
+	testMetricsChan, signalMetricsChan = testhelpers.TestMetricChan(receiversChan)
+
 	locketPort, err := portAllocator.ClaimPorts(1)
 	Expect(err).NotTo(HaveOccurred())
 
@@ -122,15 +143,13 @@ var _ = BeforeEach(func() {
 		cfg.DatabaseConnectionString = sqlRunner.ConnectionString()
 		cfg.DatabaseDriver = sqlRunner.DriverName()
 		cfg.ListenAddress = locketAddress
+		cfg.LoggregatorConfig.APIPort = metricsPort
+		cfg.LoggregatorConfig.CACertPath = metronCAFile
+		cfg.LoggregatorConfig.CertPath = metronServerCertFile
+		cfg.LoggregatorConfig.KeyPath = metronServerKeyFile
 	})
 	locketProcess = ginkgomon.Invoke(locketRunner)
 
-	metronCAFile := path.Join(fixturesPath, "metron", "CA.crt")
-	metronClientCertFile := path.Join(fixturesPath, "metron", "client.crt")
-	metronClientKeyFile := path.Join(fixturesPath, "metron", "client.key")
-	metronServerCertFile := path.Join(fixturesPath, "metron", "metron.crt")
-	metronServerKeyFile := path.Join(fixturesPath, "metron", "metron.key")
-
 	auctioneerServer = ghttp.NewServer()
 	auctioneerServer.UnhandledRequestStatusCode = http.StatusAccepted
 	auctioneerServer.AllowUnhandledRequests = true
@@ -148,18 +167,6 @@ var _ = BeforeEach(func() {
 		Host:   bbsAddress,
 	}
 
-	testIngressServer, err = testhelpers.NewTestIngressServer(metronServerCertFile, metronServerKeyFile, metronCAFile)
-	Expect(err).NotTo(HaveOccurred())
-
-	testIngressServer.Start()
-
-	metricsPort, err := strconv.Atoi(strings.TrimPrefix(testIngressServer.Addr(), "127.0.0.1:"))
-	Expect(err).NotTo(HaveOccurred())
-
-	receiversChan := testIngressServer.Receivers()
-
-	testMetricsChan, signalMetricsChan = testhelpers.TestMetricChan(receiversChan)
-
 	serverCaFile := path.Join(fixturesPath, "green-certs", "server-ca.crt")
 	clientCertFile := path.Join(fixturesPath, "green-certs", "client.crt")
 	clientKeyFile := path.Join(fixturesPath, "green-certs", "client.key")
@@ -209,7 +216,6 @@ var _ = BeforeEach(func() {
 		LagerConfig: lagerflags.LagerConfig{
 			LogLevel: lagerflags.DEBUG,
 		},
-
 		LoggregatorConfig: diego_logging_client.Config{
 			BatchFlushInterval: 10 * time.Millisecond,
 			BatchMaxSize:       1,
@@ -221,6 +227,7 @@ var _ = BeforeEach(func() {
 	}
 
 	bbsConfig.ClientLocketConfig.LocketAddress = locketAddress
+
 	locketClient, err := locket.NewClient(logger, bbsConfig.ClientLocketConfig)
 	Expect(err).NotTo(HaveOccurred())
 	locketHelper = test_helpers.NewLocketHelper(logger, locketClient)

cmd/bbs/metrics_test.go

@@ -115,9 +115,9 @@ var _ = Describe("Metrics", func() {
 				),
 			))
 		})
-
+		// This is infra monitoring rather than a metric held by bbs like Convergence. So this will be emitted by all instances regardless of lock state.
 		It("does not emit db metrics", func() {
-			Consistently(testMetricsChan, 70*time.Second).ShouldNot(Receive(
+			Eventually(testMetricsChan, 70*time.Second).Should(Receive(
 				testhelpers.MatchV2Metric(
 					testhelpers.MetricAndValue{Name: "DBOpenConnections"},
 				),

cmd/bbs/presence_test.go

@@ -36,6 +36,10 @@ var _ = Describe("CellPresence", func() {
 			cfg.DatabaseConnectionString = sqlRunner.ConnectionString()
 			cfg.DatabaseDriver = sqlRunner.DriverName()
 			cfg.ListenAddress = locketAddress
+			cfg.LoggregatorConfig.APIPort = metricsPort
+			cfg.LoggregatorConfig.CACertPath = metronCAFile
+			cfg.LoggregatorConfig.CertPath = metronServerCertFile
+			cfg.LoggregatorConfig.KeyPath = metronServerKeyFile
 		})
 
 		locketProcess = ginkgomon.Invoke(locketRunner)

cmd/bbs/sql_lock_test.go

@@ -36,6 +36,10 @@ var _ = Describe("SqlLock", func() {
 			cfg.DatabaseConnectionString = sqlRunner.ConnectionString()
 			cfg.DatabaseDriver = sqlRunner.DriverName()
 			cfg.ListenAddress = locketAddress
+			cfg.LoggregatorConfig.APIPort = metricsPort
+			cfg.LoggregatorConfig.CACertPath = metronCAFile
+			cfg.LoggregatorConfig.CertPath = metronServerCertFile
+			cfg.LoggregatorConfig.KeyPath = metronServerKeyFile
 		})
 		locketProcess = ginkgomon.Invoke(locketRunner)
 

test_helpers/metronserver_setup.go

@@ -48,7 +48,7 @@ func StartMetronIngress() (*MetronIngressSetup, error) {
 func GetLoggregatorConfigWithMetronCerts() loggingclient.Config {
 	return loggingclient.Config{
 		CACertPath: fixtures.Path("CA.crt"),
-		CertPath:   fixtures.Path("metron.crt"),
-		KeyPath:    fixtures.Path("metron.key"),
+		CertPath:   fixtures.Path("client.crt"),
+		KeyPath:    fixtures.Path("client.key"),
 	}
 }